@multiplatform.one/rich-text 6.1.0 → 6.4.0

package/dist/jsx/toolbar/LinkDialog.mjs

@@ -5,24 +5,25 @@ import { Button } from "@multiplatform.one/forms";
 import { ToolbarButton } from "./ToolbarButton.mjs";
 import { LinkIcon } from "./icons.mjs";
 import { SHORTCUTS } from "./shortcuts.mjs";
+import { t } from "../shared/t.mjs";
+import { normalizeUrl } from "../shared/url.mjs";
 import { jsx, jsxs } from "react/jsx-runtime";
-function normalizeUrl(url) {
-  const trimmed = url.trim();
-  if (!trimmed) return trimmed;
-  if (/^https?:\/\//i.test(trimmed)) return trimmed;
-  if (/^mailto:/i.test(trimmed)) return trimmed;
-  if (/^tel:/i.test(trimmed)) return trimmed;
-  return `https://${trimmed}`;
-}
 function LinkDialog({
   editorRef,
   state,
-  disabled
+  disabled,
+  open: openProp,
+  onOpenChange
 }) {
   const {
     knobProps
   } = useResolvedKnobs();
-  const [open, setOpen] = useState(false);
+  const [internalOpen, setInternalOpen] = useState(false);
+  const open = openProp ?? internalOpen;
+  const setOpen = useCallback(next => {
+    setInternalOpen(next);
+    onOpenChange?.(next);
+  }, [onOpenChange]);
   const [linkUrl, setLinkUrl] = useState("");
   const handleSubmit = useCallback(() => {
     const normalized = normalizeUrl(linkUrl);
@@ -50,7 +51,7 @@ function LinkDialog({
         active: state.isLink,
         disabled,
         onPress: () => setOpen(true),
-        "aria-label": "Link",
+        "aria-label": t("Link"),
         tooltip: SHORTCUTS.link,
         children: /* @__PURE__ */jsx(LinkIcon, {})
       })
@@ -78,7 +79,7 @@ function LinkDialog({
         children: [/* @__PURE__ */jsx(Text, {
           fontSize: knobProps.sizeToken,
           fontWeight: "600",
-          children: state.isLink ? "Edit Link" : "Add Link"
+          children: state.isLink ? t("Edit Link") : t("Add Link")
         }), /* @__PURE__ */jsx(Input, {
           size: "$3",
           placeholder: "https://example.com",
@@ -93,15 +94,15 @@ function LinkDialog({
             size: "$2",
             theme: "red",
             onPress: handleRemove,
-            "aria-label": "Remove link",
-            children: "Remove"
+            "aria-label": t("Remove link"),
+            children: t("Remove")
           }), /* @__PURE__ */jsx(Button, {
             size: "$2",
             theme: "active",
             onPress: handleSubmit,
             disabled: !linkUrl.trim(),
-            "aria-label": state.isLink ? "Update link" : "Add link",
-            children: state.isLink ? "Update" : "Add"
+            "aria-label": state.isLink ? t("Update link") : t("Add link"),
+            children: state.isLink ? t("Update") : t("Add")
           })]
         })]
       })]

package/dist/jsx/toolbar/LinkDialog.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useState","useResolvedKnobs","Input","Popover","Text","XStack","YStack","Button","ToolbarButton","LinkIcon","SHORTCUTS","jsx","jsxs","normalizeUrl","url","trimmed","trim","test","LinkDialog","editorRef","state","disabled","knobProps","open","setOpen","linkUrl","setLinkUrl","handleSubmit","normalized","current","executeCommand","href","handleRemove","onOpenChange","placement","children","Trigger","asChild","active","isLink","onPress","tooltip","link","Content","panelPadding","backgroundColor","borderWidth","borderColor","borderRadius","elevation","enterStyle","opacity","y","exitStyle","Arrow","gap","minWidth","fontSize","sizeToken","fontWeight","size","placeholder","value","onChangeText","onSubmitEditing","autoFocus","justifyContent","theme"],"sources":["../../../src/toolbar/LinkDialog.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useState","useResolvedKnobs","Input","Popover","Text","XStack","YStack","Button","ToolbarButton","LinkIcon","SHORTCUTS","t","normalizeUrl","jsx","jsxs","LinkDialog","editorRef","state","disabled","open","openProp","onOpenChange","knobProps","internalOpen","setInternalOpen","setOpen","next","linkUrl","setLinkUrl","handleSubmit","normalized","current","executeCommand","href","handleRemove","placement","children","Trigger","asChild","active","isLink","onPress","tooltip","link","Content","panelPadding","backgroundColor","borderWidth","borderColor","borderRadius","elevation","enterStyle","opacity","y","exitStyle","Arrow","gap","minWidth","fontSize","sizeToken","fontWeight","size","placeholder","value","onChangeText","onSubmitEditing","autoFocus","justifyContent","theme","trim"],"sources":["../../../src/toolbar/LinkDialog.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/jsx/toolbar/LinkDialog.native.js

@@ -22,41 +22,30 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
   value: true
 }), mod);
-var LinkDialog_exports = {};
-__export(LinkDialog_exports, {
-  LinkDialog: () => LinkDialog,
-  normalizeUrl: () => normalizeUrl
+var LinkDialog_native_exports = {};
+__export(LinkDialog_native_exports, {
+  LinkDialog: () => LinkDialog
 });
-module.exports = __toCommonJS(LinkDialog_exports);
+module.exports = __toCommonJS(LinkDialog_native_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
-var import_theme = require("@multiplatform.one/theme");
+var import_react_native = require("react-native");
 var import_tamagui = require("tamagui");
 var import_forms = require("@multiplatform.one/forms");
 var import_ToolbarButton = require("./ToolbarButton.native.js");
 var import_icons = require("./icons.native.js");
-var import_shortcuts = require("./shortcuts.native.js");
-function normalizeUrl(url) {
-  var trimmed = url.trim();
-  if (!trimmed) return trimmed;
-  if (/^https?:\/\//i.test(trimmed)) return trimmed;
-  if (/^mailto:/i.test(trimmed)) return trimmed;
-  if (/^tel:/i.test(trimmed)) return trimmed;
-  return `https://${trimmed}`;
-}
+var import_t = require("../shared/t.native.js");
+var import_url = require("../shared/url.native.js");
 function LinkDialog(param) {
   var {
     editorRef,
     state,
     disabled
   } = param;
-  var {
-    knobProps
-  } = (0, import_theme.useResolvedKnobs)();
   var [open, setOpen] = (0, import_react.useState)(false);
   var [linkUrl, setLinkUrl] = (0, import_react.useState)("");
   var handleSubmit = (0, import_react.useCallback)(function () {
-    var normalized = normalizeUrl(linkUrl);
+    var normalized = (0, import_url.normalizeUrl)(linkUrl);
     if (normalized) {
       var _editorRef_current;
       (_editorRef_current = editorRef.current) === null || _editorRef_current === void 0 ? void 0 : _editorRef_current.executeCommand("link", {
@@ -73,74 +62,88 @@ function LinkDialog(param) {
     });
     setOpen(false);
   }, [editorRef]);
-  return /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.Popover, {
-    open,
-    onOpenChange: setOpen,
-    placement: "bottom",
-    children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Popover.Trigger, {
-      asChild: true,
-      children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_ToolbarButton.ToolbarButton, {
-        active: state.isLink,
-        disabled,
+  return /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
+    children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_ToolbarButton.ToolbarButton, {
+      active: state.isLink,
+      disabled,
+      onPress: function onPress() {
+        return setOpen(true);
+      },
+      "aria-label": (0, import_t.t)("Link"),
+      children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_icons.LinkIcon, {})
+    }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_react_native.Modal, {
+      visible: open,
+      transparent: true,
+      animationType: "fade",
+      onRequestClose: function onRequestClose() {
+        return setOpen(false);
+      },
+      children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_react_native.Pressable, {
+        style: styles.backdrop,
         onPress: function onPress() {
-          return setOpen(true);
+          return setOpen(false);
         },
-        "aria-label": "Link",
-        tooltip: import_shortcuts.SHORTCUTS.link,
-        children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_icons.LinkIcon, {})
+        children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_react_native.Pressable, {
+          style: styles.sheet,
+          onPress: function onPress(e) {
+            return e.stopPropagation();
+          },
+          children: /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.YStack, {
+            backgroundColor: "$background",
+            borderRadius: "$4",
+            padding: "$4",
+            gap: "$3",
+            minWidth: 280,
+            children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Text, {
+              fontWeight: "600",
+              children: state.isLink ? (0, import_t.t)("Edit Link") : (0, import_t.t)("Add Link")
+            }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Input, {
+              size: "$3",
+              placeholder: "https://example.com",
+              value: linkUrl,
+              onChangeText: setLinkUrl,
+              onSubmitEditing: handleSubmit,
+              autoFocus: true,
+              autoCapitalize: "none",
+              keyboardType: "url"
+            }), /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.XStack, {
+              gap: "$2",
+              justifyContent: "flex-end",
+              children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_forms.Button, {
+                size: "$2",
+                onPress: function onPress() {
+                  return setOpen(false);
+                },
+                "aria-label": (0, import_t.t)("Cancel"),
+                children: (0, import_t.t)("Cancel")
+              }), state.isLink && /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_forms.Button, {
+                size: "$2",
+                theme: "red",
+                onPress: handleRemove,
+                "aria-label": (0, import_t.t)("Remove link"),
+                children: (0, import_t.t)("Remove")
+              }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_forms.Button, {
+                size: "$2",
+                theme: "active",
+                onPress: handleSubmit,
+                disabled: !linkUrl.trim(),
+                "aria-label": state.isLink ? (0, import_t.t)("Update link") : (0, import_t.t)("Add link"),
+                children: state.isLink ? (0, import_t.t)("Update") : (0, import_t.t)("Add")
+              })]
+            })]
+          })
+        })
       })
-    }), /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.Popover.Content, {
-      ...knobProps.panelPadding,
-      backgroundColor: "$background",
-      borderWidth: 1,
-      borderColor: "$borderColor",
-      borderRadius: knobProps.borderRadius.borderRadius,
-      elevation: knobProps.elevation,
-      enterStyle: {
-        opacity: 0,
-        y: -5
-      },
-      exitStyle: {
-        opacity: 0,
-        y: -5
-      },
-      children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Popover.Arrow, {
-        borderColor: "$borderColor",
-        backgroundColor: "$background"
-      }), /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.YStack, {
-        gap: "$2",
-        minWidth: 250,
-        children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Text, {
-          fontSize: knobProps.sizeToken,
-          fontWeight: "600",
-          children: state.isLink ? "Edit Link" : "Add Link"
-        }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Input, {
-          size: "$3",
-          placeholder: "https://example.com",
-          value: linkUrl,
-          onChangeText: setLinkUrl,
-          onSubmitEditing: handleSubmit,
-          autoFocus: true
-        }), /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.XStack, {
-          gap: "$2",
-          justifyContent: "flex-end",
-          children: [state.isLink && /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_forms.Button, {
-            size: "$2",
-            theme: "red",
-            onPress: handleRemove,
-            "aria-label": "Remove link",
-            children: "Remove"
-          }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_forms.Button, {
-            size: "$2",
-            theme: "active",
-            onPress: handleSubmit,
-            disabled: !linkUrl.trim(),
-            "aria-label": state.isLink ? "Update link" : "Add link",
-            children: state.isLink ? "Update" : "Add"
-          })]
-        })]
-      })]
     })]
   });
 }
+var styles = import_react_native.StyleSheet.create({
+  backdrop: {
+    flex: 1,
+    backgroundColor: "rgba(0,0,0,0.4)",
+    alignItems: "center",
+    justifyContent: "center"
+  },
+  sheet: {}
+});
 //# sourceMappingURL=LinkDialog.native.js.map

package/dist/jsx/toolbar/LinkDialog.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__defProp","Object","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toCommonJS","mod","value","LinkDialog_exports","LinkDialog","normalizeUrl","module","exports","import_jsx_runtime","require","import_react","import_theme","import_tamagui","import_forms","import_ToolbarButton","import_icons","import_shortcuts","url","trimmed","trim","test","param","editorRef","state","disabled","knobProps","useResolvedKnobs","open","setOpen","useState","linkUrl","setLinkUrl","handleSubmit","useCallback","normalized","_editorRef_current","current","executeCommand","href","handleRemove","jsxs","Popover","onOpenChange","placement","children","jsx","Trigger","asChild","ToolbarButton","active","isLink","onPress","tooltip","SHORTCUTS","link","LinkIcon","Content","panelPadding","backgroundColor","borderWidth"],"sources":["../../../src/toolbar/LinkDialog.tsx"],"sourcesContent":[null],"mappings":"AAIA,YAAS;;AACT,IAAAA,SAAS,GAAAC,MAAA,CAAAC,cAAwB;AACjC,IAAAC,gBAAgB,GAAAF,MAAS,CAAAG,wBAA4B;AACrD,IAAAC,iBAAS,GAAcJ,MAAA,CAAAK,mBAAA;AAEvB,IAAAC,YAAS,GAAAN,MAAA,CAAAO,SAAqB,CAAAC,cAAA;AAC9B,IAAAC,QAAS,GAAAA,CAAAC,MAAA,EAAAC,GAAgB;EACzB,SAASC,IAAA,IAAAD,GAAA,EAgECZ,SAAA,CA0BAW,MAAA,EAAAE,IA1BA;IAAAC,GAAA,EAAAF,GAAA,CAAAC,IAAA;IAAAE,UAAA;EAAA;AA1CV;AACE,IAAAC,WAAM,GAAUA,CAAAC,EAAA,EAAIC,IAAK,EAAAC,MAAA,EAAAC,IAAA;EACzB,IAAIF,IAAC,WAASA,IAAO,wBAAAA,IAAA;IACrB,KAAI,IAAAG,GAAA,IAAAhB,iBAA+B,CAAAa,IAAA,GAC/B,KAAAX,YAAiB,CAAAe,IAAA,CAAAL,EAAO,EAAGI,GAAA,KAAOA,GAAA,KAAAF,MAAA,EAClCnB,SAAS,CAAAiB,EAAK,EAAAI,GAAA,EAAO;MAAGP,GAAA,EAAAA,CAAA,KAAOI,IAAA,CAAAG,GAAA;MAAAN,UAAA,IAAAK,IAAA,GAAAjB,gBAAA,CAAAe,IAAA,EAAAG,GAAA,MAAAD,IAAA,CAAAL;IAAA;EACnC;EACF,OAAAE,EAAA;AAMO;AACL,IAAAM,YAAQ,GAAUC,GAAA,IAAIR,WAAA,CAAAhB,SAAiB;EAAAyB,KAAA;AAAA,IAAAD,GAAA;AACvC,IAAAE,kBAAoB,IAAI;AACxBhB,QAAM,CAACgB,kBAAS,EAAU;EAE1BC,UAAM,EAAAA,CAAA,KAAAA,UAAe;EACnBC,YAAM,EAAAA,CAAA,KAAAA;AACN;AACEC,MAAA,CAAAC,OAAA,GAAUP,YAAS,CAAAG,kBAAuB;AAAoB,IAChEK,kBAAA,GAAAC,OAAA;AACA,IAAAC,YAAW,GAAED,OAAA;AACb,IAAAE,YAAQ,GAAKF,OAAA;AAAA,IACfG,cAAa,GAAAH,OAAU;AAEvB,IAAAI,YAAM,GAAAJ,OAAe,2BAAkB;AACrC,IAAAK,oBAAmB,GAAAL,OAAA,4BAAyB;AAC5C,IAAAM,YAAQ,GAAKN,OAAA;AAAA,IACfO,gBAAc,GAAAP,OAAA;AAEd,SACEJ,aAAAY,GAAA;EACE,IAAAC,OAAA,GAAAD,GAAA,CAAAE,IAAC;EACC,IAAC,CAAAD,OAAA,SAAAA,OAAA;EAAA,oBAAAE,IAAA,CAAAF,OAAA,UAAAA,OAAA;EAAA,eACS,CAAAE,IAAM,CAAAF,OAAA,UAAAA,OAAA;EAAA,YACd,CAAAE,IAAA,CAAAF,OAAA,UAAAA,OAAA;EAAA,OACA,WAASA,OAAM;AAAY;AAChB,SACXd,UAASA,CAAAiB,KAAA,EAAU;EAAA;IAEnBC,SAAA;IAAAC,KAAA;IAAAC;EAAA,IAACH,KAAA;EAAS;IAAAI;EAAA,QAAAd,YAAA,CAAAe,gBAAA;EAAA,IACZ,CACFC,IAAA,EAAAC,OAAA,QAAAlB,YAAA,CAAAmB,QAAA;EAAA,IACA,CAAAC,OAAA,EAAAC,UAAA,QAAArB,YAAA,CAAAmB,QAAA;EAAA,IAACG,YAAQ,OAAAtB,YAAA,CAAAuB,WAAA;IAAA,IAARC,UAAA,GAAA7B,YAAA,CAAAyB,OAAA;IAAA,IACEI,UAAG;MAAU,IACdC,kBAAgB;MAAA,CAAAA,kBACH,GAAAb,SAAA,CAAAc,OAAA,cAAAD,kBAAA,uBAAAA,kBAAA,CAAAE,cAAA;QACbC,IAAA,EAAAJ;MAAY,EACZ;IAAqC;IAChBH,UACrB;IAAgCH,OAChC;EAA+B,IAE/BE,OAAA,EAAwER,SACxE,CACE;EAEA,IAAAiB,YACA,OAAA7B,YAAA,CAAAuB,WAAA;IAAA,IAAAE,kBAAC;IAAA,CAAAA,kBAAA,GAAAb,SAAA,CAAAc,OAAA,cAAAD,kBAAA,uBAAAA,kBAAA,CAAAE,cAAA;MAAAC,IAAA;IACM;IACOV,OAAA,MACZ;EAAO,IACON,SAAA,CACG;EACR,0BAAAd,kBAAA,CAAAgC,IAAA,EAAA5B,cAAA,CAAA6B,OAAA;IAAAd,IAAA;IACXe,YACA,EAAAd,OAAA;IACGe,SAAA,UAAM;IAGLC,QAAA,EAEF,gBAAC,IAAApC,kBAAA,CAAAqC,GAAA,EAAAjC,cAAA,CAAA6B,OAAA,CAAAK,OAAA;MAAAC,OAAA;MAAAH,QAAA,EACC,eAAK,IAAApC,kBAAA,CAAAqC,GAAA,EAAA/B,oBAAA,CAAAkC,aAAA;QAAAC,MAAA,EACL1B,KAAA,CAAA2B,MAAM;QAAA1B,QACN;QAAS2B,OAAA,EACT,SAAUA,OAACA,CAAA,EAAQ;UAAK,OACxBvB,OAAA,MAAY;QAA+B;QAEhB;QAAAwB,OAC7B,EAAApC,gBAAA,CAAAqC,SAAA,CAAAC,IAAA;QAAAV,QACF,qBAAApC,kBAAA,CAAAqC,GAAA,EAAA9B,YAAA,CAAAwC,QAAA;MAAA;IACF,uBAAA/C,kBAAA,CAAAgC,IAAA,EAAA5B,cAAA,CAAA6B,OAAA,CAAAe,OAAA;MACF,GAAA/B,SAAA,CAAAgC,YAAA;MACFC,eAAA;MAEJC,WAAA","ignoreList":[]}
+{"version":3,"names":["LinkDialog_native_exports","__export","LinkDialog","module","exports","__toCommonJS","import_jsx_runtime","require","import_react","import_react_native","import_tamagui","import_forms","import_ToolbarButton","import_icons","import_t","import_url","param","editorRef","state","disabled","open","setOpen","useState","linkUrl","setLinkUrl","handleSubmit","useCallback","normalized","normalizeUrl","_editorRef_current","current","executeCommand","href","handleRemove","jsxs","Fragment","children","jsx","ToolbarButton","active","isLink","onPress","t","LinkIcon","Modal","visible","transparent","animationType","onRequestClose","Pressable","style","styles","backdrop","sheet","e","stopPropagation","YStack","backgroundColor","borderRadius","padding","gap","minWidth","Text","fontWeight","Input","size","placeholder","value","onChangeText","onSubmitEditing","autoFocus","autoCapitalize","keyboardType","XStack","justifyContent","Button","theme","trim","StyleSheet","create","flex","alignItems"],"sources":["../../../src/toolbar/LinkDialog.native.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/jsx/toolbar/ListPicker.mjs

@@ -1,22 +1,21 @@
-import { useState } from "react";
-import { useResolvedKnobs } from "@multiplatform.one/theme";
-import { Popover, Text, YStack } from "tamagui";
-import { DropdownMenuItemFrame } from "../styled.mjs";
+import { useRef, useState } from "react";
+import { DropdownMenu } from "@multiplatform.one/components";
 import { ToolbarDropdownButton } from "./ToolbarButton.mjs";
 import { BulletListIcon, OrderedListIcon, TaskListIcon } from "./icons.mjs";
+import { t } from "../shared/t.mjs";
 import { jsx, jsxs } from "react/jsx-runtime";
 const LIST_OPTIONS = [{
-  label: "Bullet List",
+  label: () => t("Bullet List"),
   command: "bulletList",
   stateKey: "isBulletList",
   icon: BulletListIcon
 }, {
-  label: "Ordered List",
+  label: () => t("Ordered List"),
   command: "orderedList",
   stateKey: "isOrderedList",
   icon: OrderedListIcon
 }, {
-  label: "Task List",
+  label: () => t("Task List"),
   command: "taskList",
   stateKey: "isTaskList",
   icon: TaskListIcon
@@ -34,56 +33,46 @@ function ListPicker({
   state,
   disabled
 }) {
-  const {
-    knobProps
-  } = useResolvedKnobs();
   const [open, setOpen] = useState(false);
+  const selectedRef = useRef(false);
   const ActiveIcon = getActiveListIcon(state);
-  return /* @__PURE__ */jsxs(Popover, {
+  return /* @__PURE__ */jsxs(DropdownMenu, {
     open,
     onOpenChange: setOpen,
     placement: "bottom-start",
-    children: [/* @__PURE__ */jsx(Popover.Trigger, {
+    children: [/* @__PURE__ */jsx(DropdownMenu.Trigger, {
       asChild: true,
       children: /* @__PURE__ */jsx(ToolbarDropdownButton, {
         active: isAnyListActive(state),
         disabled,
         onPress: () => setOpen(true),
-        "aria-label": "Lists",
+        "aria-label": t("Lists"),
         children: /* @__PURE__ */jsx(ActiveIcon, {})
       })
-    }), /* @__PURE__ */jsx(Popover.Content, {
-      ...knobProps.panelPadding,
-      backgroundColor: "$background",
-      borderWidth: 1,
-      borderColor: "$borderColor",
-      borderRadius: knobProps.borderRadius.borderRadius,
-      elevation: knobProps.elevation,
-      enterStyle: {
-        opacity: 0,
-        y: -5
+    }), /* @__PURE__ */jsx(DropdownMenu.Content, {
+      minWidth: 150,
+      onCloseAutoFocus: event => {
+        event.preventDefault();
+        if (selectedRef.current) {
+          selectedRef.current = false;
+          editorRef.current?.focus();
+        }
       },
-      exitStyle: {
-        opacity: 0,
-        y: -5
-      },
-      children: /* @__PURE__ */jsx(YStack, {
-        gap: "$1",
-        minWidth: 150,
-        children: LIST_OPTIONS.map(option => {
-          const Icon = option.icon;
-          return /* @__PURE__ */jsxs(DropdownMenuItemFrame, {
-            active: state[option.stateKey],
-            onPress: () => {
-              editorRef.current?.executeCommand(option.command);
-              setOpen(false);
-            },
-            "aria-label": option.label,
-            children: [/* @__PURE__ */jsx(Icon, {}), /* @__PURE__ */jsx(Text, {
-              children: option.label
-            })]
-          }, option.command);
-        })
+      children: LIST_OPTIONS.map(option => {
+        const Icon = option.icon;
+        const label = option.label();
+        return /* @__PURE__ */jsx(DropdownMenu.Item, {
+          icon: /* @__PURE__ */jsx(Icon, {}),
+          closeOnSelect: false,
+          backgroundColor: state[option.stateKey] ? "$color4" : void 0,
+          "aria-label": label,
+          onSelect: () => {
+            selectedRef.current = true;
+            editorRef.current?.executeCommand(option.command);
+            setOpen(false);
+          },
+          children: label
+        }, option.command);
       })
     })]
   });

package/dist/jsx/toolbar/ListPicker.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useState","useResolvedKnobs","Popover","Text","YStack","DropdownMenuItemFrame","ToolbarDropdownButton","BulletListIcon","OrderedListIcon","TaskListIcon","jsx","jsxs","LIST_OPTIONS","label","command","stateKey","icon","getActiveListIcon","state","isOrderedList","isTaskList","isAnyListActive","isBulletList","ListPicker","editorRef","disabled","knobProps","open","setOpen","ActiveIcon","onOpenChange","placement","children","Trigger","asChild","active","onPress","Content","panelPadding","backgroundColor","borderWidth","borderColor","borderRadius","elevation","enterStyle","opacity","y","exitStyle","gap","minWidth","map","option","Icon","current","executeCommand"],"sources":["../../../src/toolbar/ListPicker.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useRef","useState","DropdownMenu","ToolbarDropdownButton","BulletListIcon","OrderedListIcon","TaskListIcon","t","jsx","jsxs","LIST_OPTIONS","label","command","stateKey","icon","getActiveListIcon","state","isOrderedList","isTaskList","isAnyListActive","isBulletList","ListPicker","editorRef","disabled","open","setOpen","selectedRef","ActiveIcon","onOpenChange","placement","children","Trigger","asChild","active","onPress","Content","minWidth","onCloseAutoFocus","event","preventDefault","current","focus","map","option","Icon","Item","closeOnSelect","backgroundColor","onSelect","executeCommand"],"sources":["../../../src/toolbar/ListPicker.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/jsx/toolbar/ListPicker.native.js

@@ -29,23 +29,28 @@ __export(ListPicker_exports, {
 module.exports = __toCommonJS(ListPicker_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
-var import_theme = require("@multiplatform.one/theme");
-var import_tamagui = require("tamagui");
-var import_styled = require("../styled.native.js");
+var import_components = require("@multiplatform.one/components");
 var import_ToolbarButton = require("./ToolbarButton.native.js");
 var import_icons = require("./icons.native.js");
+var import_t = require("../shared/t.native.js");
 var LIST_OPTIONS = [{
-  label: "Bullet List",
+  label: function label() {
+    return (0, import_t.t)("Bullet List");
+  },
   command: "bulletList",
   stateKey: "isBulletList",
   icon: import_icons.BulletListIcon
 }, {
-  label: "Ordered List",
+  label: function label2() {
+    return (0, import_t.t)("Ordered List");
+  },
   command: "orderedList",
   stateKey: "isOrderedList",
   icon: import_icons.OrderedListIcon
 }, {
-  label: "Task List",
+  label: function label3() {
+    return (0, import_t.t)("Task List");
+  },
   command: "taskList",
   stateKey: "isTaskList",
   icon: import_icons.TaskListIcon
@@ -64,16 +69,14 @@ function ListPicker(param) {
     state,
     disabled
   } = param;
-  var {
-    knobProps
-  } = (0, import_theme.useResolvedKnobs)();
   var [open, setOpen] = (0, import_react.useState)(false);
+  var selectedRef = (0, import_react.useRef)(false);
   var ActiveIcon = getActiveListIcon(state);
-  return /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_tamagui.Popover, {
+  return /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_components.DropdownMenu, {
     open,
     onOpenChange: setOpen,
     placement: "bottom-start",
-    children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Popover.Trigger, {
+    children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.DropdownMenu.Trigger, {
       asChild: true,
       children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_ToolbarButton.ToolbarDropdownButton, {
         active: isAnyListActive(state),
@@ -81,42 +84,38 @@ function ListPicker(param) {
         onPress: function onPress() {
           return setOpen(true);
         },
-        "aria-label": "Lists",
+        "aria-label": (0, import_t.t)("Lists"),
         children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(ActiveIcon, {})
       })
-    }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Popover.Content, {
-      ...knobProps.panelPadding,
-      backgroundColor: "$background",
-      borderWidth: 1,
-      borderColor: "$borderColor",
-      borderRadius: knobProps.borderRadius.borderRadius,
-      elevation: knobProps.elevation,
-      enterStyle: {
-        opacity: 0,
-        y: -5
-      },
-      exitStyle: {
-        opacity: 0,
-        y: -5
+    }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.DropdownMenu.Content, {
+      minWidth: 150,
+      // Toolbar menus must not steal focus back to the trigger on
+      // select-close: focus returns to the editor so typing continues.
+      // Escape still restores the trigger via the menu's own close().
+      onCloseAutoFocus: function onCloseAutoFocus(event) {
+        event.preventDefault();
+        if (selectedRef.current) {
+          var _editorRef_current;
+          selectedRef.current = false;
+          (_editorRef_current = editorRef.current) === null || _editorRef_current === void 0 ? void 0 : _editorRef_current.focus();
+        }
       },
-      children: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.YStack, {
-        gap: "$1",
-        minWidth: 150,
-        children: LIST_OPTIONS.map(function (option) {
-          var Icon = option.icon;
-          return /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_styled.DropdownMenuItemFrame, {
-            active: state[option.stateKey],
-            onPress: function onPress() {
-              var _editorRef_current;
-              (_editorRef_current = editorRef.current) === null || _editorRef_current === void 0 ? void 0 : _editorRef_current.executeCommand(option.command);
-              setOpen(false);
-            },
-            "aria-label": option.label,
-            children: [/* @__PURE__ */(0, import_jsx_runtime.jsx)(Icon, {}), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_tamagui.Text, {
-              children: option.label
-            })]
-          }, option.command);
-        })
+      children: LIST_OPTIONS.map(function (option) {
+        var Icon = option.icon;
+        var label4 = option.label();
+        return /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.DropdownMenu.Item, {
+          icon: /* @__PURE__ */(0, import_jsx_runtime.jsx)(Icon, {}),
+          closeOnSelect: false,
+          backgroundColor: state[option.stateKey] ? "$color4" : void 0,
+          "aria-label": label4,
+          onSelect: function onSelect() {
+            var _editorRef_current;
+            selectedRef.current = true;
+            (_editorRef_current = editorRef.current) === null || _editorRef_current === void 0 ? void 0 : _editorRef_current.executeCommand(option.command);
+            setOpen(false);
+          },
+          children: label4
+        }, option.command);
       })
     })]
   });