This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Support Scribble Handwriting #24224
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,4 +20,5 @@ Hidenori Matsubayashi <[email protected]> | |
| Sarbagya Dhaubanjar <[email protected]> | ||
| Callum Moffat <[email protected]> | ||
| Koutaro Mori <[email protected]> | ||
| TheOneWithTheBraid <[email protected]> | ||
| Twin Sun, LLC <[email protected]> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,7 @@ | |
| #import "flutter/shell/platform/darwin/common/command_line.h" | ||
| #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h" | ||
| #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h" | ||
| #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterIndirectScribbleDelegate.h" | ||
| #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterObservatoryPublisher.h" | ||
| #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h" | ||
| #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h" | ||
|
|
@@ -42,7 +43,9 @@ @interface FlutterEngineRegistrar : NSObject <FlutterPluginRegistrar> | |
| - (instancetype)initWithPlugin:(NSString*)pluginKey flutterEngine:(FlutterEngine*)flutterEngine; | ||
| @end | ||
|
|
||
| @interface FlutterEngine () <FlutterIndirectScribbleDelegate, | ||
| FlutterTextInputDelegate, | ||
| FlutterBinaryMessenger> | ||
| // Maintains a dictionary of plugin names that have registered with the engine. Used by | ||
| // FlutterEngineRegistrar to implement a FlutterPluginRegistrar. | ||
| @property(nonatomic, readonly) NSMutableDictionary* pluginPublications; | ||
|
|
@@ -331,6 +334,7 @@ - (void)setViewController:(FlutterViewController*)viewController { | |
|
|
||
| - (void)attachView { | ||
| self.iosPlatformView->attachView(); | ||
| [_textInputPlugin.get() setupIndirectScribbleInteraction:self.viewController]; | ||
| } | ||
|
|
||
| - (void)setFlutterViewControllerWillDeallocObserver:(id<NSObject>)observer { | ||
|
|
@@ -355,6 +359,7 @@ - (void)notifyViewControllerDeallocated { | |
| platform_view->SetOwnerViewController({}); | ||
| } | ||
| } | ||
| [_textInputPlugin.get() resetViewResponder]; | ||
| _viewController.reset(); | ||
| } | ||
|
|
||
|
|
@@ -514,6 +519,8 @@ - (void)setupChannels { | |
|
|
||
| _textInputPlugin.reset([[FlutterTextInputPlugin alloc] init]); | ||
| _textInputPlugin.get().textInputDelegate = self; | ||
| _textInputPlugin.get().indirectScribbleDelegate = self; | ||
| [_textInputPlugin.get() setupIndirectScribbleInteraction:self.viewController]; | ||
|
|
||
| _platformPlugin.reset([[FlutterPlatformPlugin alloc] initWithEngine:[self getWeakPtr]]); | ||
|
|
||
|
|
@@ -720,22 +727,30 @@ - (void)notifyLowMemory { | |
|
|
||
| #pragma mark - Text input delegate | ||
|
|
||
| - (void)flutterTextInputView:(FlutterTextInputView*)textInputView | ||
| updateEditingClient:(int)client | ||
| withState:(NSDictionary*)state { | ||
| [_textInputChannel.get() invokeMethod:@"TextInputClient.updateEditingState" | ||
| arguments:@[ @(client), state ]]; | ||
| } | ||
|
|
||
| - (void)flutterTextInputView:(FlutterTextInputView*)textInputView | ||
| updateEditingClient:(int)client | ||
| withState:(NSDictionary*)state | ||
| withTag:(NSString*)tag { | ||
| [_textInputChannel.get() invokeMethod:@"TextInputClient.updateEditingStateWithTag" | ||
| arguments:@[ @(client), @{tag : state} ]]; | ||
| } | ||
|
|
||
| - (void)flutterTextInputView:(FlutterTextInputView*)textInputView | ||
| updateEditingClient:(int)client | ||
| withDelta:(NSDictionary*)delta { | ||
| [_textInputChannel.get() invokeMethod:@"TextInputClient.updateEditingStateWithDeltas" | ||
| arguments:@[ @(client), delta ]]; | ||
| } | ||
|
|
||
| - (void)flutterTextInputView:(FlutterTextInputView*)textInputView | ||
| updateFloatingCursor:(FlutterFloatingCursorDragState)state | ||
| withClient:(int)client | ||
| withPosition:(NSDictionary*)position { | ||
| NSString* stateString; | ||
|
|
@@ -754,7 +769,9 @@ - (void)updateFloatingCursor:(FlutterFloatingCursorDragState)state | |
| arguments:@[ @(client), stateString, position ]]; | ||
| } | ||
|
|
||
| - (void)flutterTextInputView:(FlutterTextInputView*)textInputView | ||
| performAction:(FlutterTextInputAction)action | ||
| withClient:(int)client { | ||
| NSString* actionString; | ||
| switch (action) { | ||
| case FlutterTextInputActionUnspecified: | ||
|
|
@@ -799,15 +816,63 @@ - (void)performAction:(FlutterTextInputAction)action withClient:(int)client { | |
| arguments:@[ @(client), actionString ]]; | ||
| } | ||
|
|
||
| - (void)flutterTextInputView:(FlutterTextInputView*)textInputView | ||
| showAutocorrectionPromptRectForStart:(NSUInteger)start | ||
| end:(NSUInteger)end | ||
| withClient:(int)client { | ||
| [_textInputChannel.get() invokeMethod:@"TextInputClient.showAutocorrectionPromptRect" | ||
| arguments:@[ @(client), @(start), @(end) ]]; | ||
| } | ||
|
|
||
| #pragma mark - FlutterViewEngineDelegate | ||
|
|
||
| - (void)flutterTextInputView:(FlutterTextInputView*)textInputView showToolbar:(int)client { | ||
| [_textInputChannel.get() invokeMethod:@"TextInputClient.showToolbar" arguments:@[ @(client) ]]; | ||
| } | ||
|
|
||
| - (void)flutterTextInputPlugin:(FlutterTextInputPlugin*)textInputPlugin | ||
| focusElement:(UIScribbleElementIdentifier)elementIdentifier | ||
| atPoint:(CGPoint)referencePoint | ||
| result:(FlutterResult)callback { | ||
| [_textInputChannel.get() | ||
| invokeMethod:@"TextInputClient.focusElement" | ||
| arguments:@[ elementIdentifier, @(referencePoint.x), @(referencePoint.y) ] | ||
| result:callback]; | ||
| } | ||
|
|
||
| - (void)flutterTextInputPlugin:(FlutterTextInputPlugin*)textInputPlugin | ||
| requestElementsInRect:(CGRect)rect | ||
| result:(FlutterResult)callback { | ||
| [_textInputChannel.get() | ||
| invokeMethod:@"TextInputClient.requestElementsInRect" | ||
| arguments:@[ @(rect.origin.x), @(rect.origin.y), @(rect.size.width), @(rect.size.height) ] | ||
| result:callback]; | ||
| } | ||
|
|
||
| - (void)flutterTextInputViewScribbleInteractionBegan:(FlutterTextInputView*)textInputView { | ||
| [_textInputChannel.get() invokeMethod:@"TextInputClient.scribbleInteractionBegan" arguments:nil]; | ||
|
There was a problem hiding this comment. should there be a framework pr associated with the change? it may be easier to review if you can also create the framework part pr There was a problem hiding this comment. @chunhtai Yes, I should have put a link to it in the description. Here it is: flutter/flutter#75472 |
||
| } | ||
|
|
||
| - (void)flutterTextInputViewScribbleInteractionFinished:(FlutterTextInputView*)textInputView { | ||
| [_textInputChannel.get() invokeMethod:@"TextInputClient.scribbleInteractionFinished" | ||
| arguments:nil]; | ||
| } | ||
|
|
||
| - (void)flutterTextInputView:(FlutterTextInputView*)textInputView | ||
| insertTextPlaceholderWithSize:(CGSize)size | ||
| withClient:(int)client { | ||
| [_textInputChannel.get() invokeMethod:@"TextInputClient.insertTextPlaceholder" | ||
| arguments:@[ @(client), @(size.width), @(size.height) ]]; | ||
| } | ||
|
|
||
| - (void)flutterTextInputView:(FlutterTextInputView*)textInputView | ||
| removeTextPlaceholder:(int)client { | ||
| [_textInputChannel.get() invokeMethod:@"TextInputClient.removeTextPlaceholder" | ||
| arguments:@[ @(client) ]]; | ||
| } | ||
|
|
||
| #pragma mark - Screenshot Delegate | ||
|
|
||
| - (flutter::Rasterizer::Screenshot)takeScreenshot:(flutter::Rasterizer::ScreenshotType)type | ||
| asBase64Encoded:(BOOL)base64Encode { | ||
| FML_DCHECK(_shell) << "Cannot takeScreenshot without a shell"; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERINDIRECTSCRIBBLEDELEGATE_H_ | ||
| #define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERINDIRECTSCRIBBLEDELEGATE_H_ | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
| @class FlutterTextInputPlugin; | ||
|
|
||
|
There was a problem hiding this comment. This should have |
||
| @protocol FlutterIndirectScribbleDelegate <NSObject> | ||
| - (void)flutterTextInputPlugin:(FlutterTextInputPlugin*)textInputPlugin | ||
| focusElement:(UIScribbleElementIdentifier)elementIdentifier | ||
| atPoint:(CGPoint)referencePoint | ||
| result:(FlutterResult)callback; | ||
| - (void)flutterTextInputPlugin:(FlutterTextInputPlugin*)textInputPlugin | ||
| requestElementsInRect:(CGRect)rect | ||
| result:(FlutterResult)callback; | ||
| @end | ||
| NS_ASSUME_NONNULL_END | ||
|
|
||
| #endif // SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERINDIRECTSCRIBBLEDELEGATE_H_ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Came across this while looking into refactoring
attachView. Does it make sense to move this line somewhere else?setupIndirectScribbleInteraction:selfdoesn't sound like should be a part of "attachView"There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe there's a better place for it...iirc it's purpose here is to make sure the indirect scribble interaction is set up along with the view – that is something that needs to always be there so that we can capture scribble interactions that happen outside of text areas