fix macOS

packages/zefyr/example/ios/Flutter/flutter_export_environment.sh

@@ -2,11 +2,13 @@
 # This is a generated file; do not edit or check into version control.
 export "FLUTTER_ROOT=/Users/imac/.fvm/versions/latest-dev"
 export "FLUTTER_APPLICATION_PATH=/Users/imac/Documents/flutter/projects/zefyr/packages/zefyr/example"
-export "FLUTTER_TARGET=/Users/imac/Documents/flutter/projects/zefyr/packages/zefyr/example/lib/main.dart"
+export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "SYMROOT=${SOURCE_ROOT}/../build/ios"
 export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
 export "FLUTTER_FRAMEWORK_DIR=/Users/imac/.fvm/versions/latest-dev/bin/cache/artifacts/engine/ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1"
-export "TRACK_WIDGET_CREATION=true"
+export "DART_OBFUSCATION=false"
+export "TRACK_WIDGET_CREATION=false"
+export "TREE_SHAKE_ICONS=false"

packages/zefyr/lib/src/widgets/buttons.dart

@@ -921,6 +921,8 @@ class _LinkButtonState extends State<LinkButton> {
           ));
       editor.formatSelection(NotusAttribute.link.fromString(result.url));
       editor.closeKeyboard();
+    } else {
+      editor.updateSelection(_selection, source: ChangeSource.local);
     }
   }
 

packages/zefyr/lib/src/widgets/editable_text.dart

@@ -137,7 +137,7 @@ class ZefyrEditableTextState extends State<ZefyrEditableText>
 
   TextSelectionControls defaultSelectionControls(BuildContext context) {
     TargetPlatform platform = Theme.of(context).platform;
-    if (platform == TargetPlatform.iOS) {
+    if (platform == TargetPlatform.iOS || platform == TargetPlatform.macOS) {
       return cupertinoTextSelectionControls;
     }
     return materialTextSelectionControls;

packages/zefyr/lib/src/widgets/theme.dart

@@ -360,6 +360,7 @@ class AttributeTheme {
     String monospaceFontFamily;
     switch (theme.platform) {
       case TargetPlatform.iOS:
+      case TargetPlatform.macOS:
         monospaceFontFamily = 'Menlo';
         break;
       case TargetPlatform.android:

packages/zefyr/lib/src/widgets/toolbar.dart

@@ -311,6 +311,20 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
     super.dispose();
   }
 
+  Widget buildTrailing() {
+    Widget widget;
+    TargetPlatform platform = Theme.of(context).platform;
+    switch (platform) {
+      case TargetPlatform.iOS:
+      case TargetPlatform.android:
+        widget = hasOverlay ? buildButton(context, ZefyrToolbarAction.showKeyboard) : buildButton(context, ZefyrToolbarAction.hideKeyboard);
+        break;
+      default:
+        break;
+    }
+    return widget;
+  }
+
   @override
   Widget build(BuildContext context) {
     if (MediaQuery.of(context).viewInsets.bottom > 0) {
@@ -326,10 +340,11 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
     );
     final layers = <Widget>[];
     Widget overlay;
-
+    var trailing = buildTrailing();
     // Must set unique key for the toolbar to prevent it from reconstructing
     // new state each time we toggle overlay.
     final bottons = <Widget>[
+      if (trailing != null)
       kToolbarDivider,
       Expanded(child: ListView(
         scrollDirection: Axis.horizontal,
@@ -353,7 +368,8 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
       body: Row(
         children: bottons,
       ),
-      trailing: hasOverlay ? buildButton(context, ZefyrToolbarAction.showKeyboard) : buildButton(context, ZefyrToolbarAction.hideKeyboard),
+      trailing: trailing,
+      autoImplyTrailing: false,
     );
     layers.add(toolbar);
     if (hasOverlay) {
@@ -384,23 +400,6 @@ class ZefyrToolbarState extends State<ZefyrToolbar>
       ),
     );
   }
-
-  List<Widget> _buildButtons(BuildContext context) {
-    final buttons = <Widget>[
-      HeadingButton(),
-      buildButton(context, ZefyrToolbarAction.emoji),
-      if (editor.imageDelegate != null) ImageButton(),
-      // ImageButton(),
-      LinkButton(),
-      
-      // buildButton(context, ZefyrToolbarAction.bulletList),
-      // buildButton(context, ZefyrToolbarAction.numberList),
-      // buildButton(context, ZefyrToolbarAction.quote),
-      // buildButton(context, ZefyrToolbarAction.code),
-      // buildButton(context, ZefyrToolbarAction.horizontalRule),
-    ];
-    return buttons;
-  }
 }
 
 /// Scrollable list of toolbar buttons.