@revisium/schema-toolkit-ui 0.3.1 → 0.3.3

package/dist/index.cjs

@@ -2546,7 +2546,7 @@ function useContentEditable(options) {
 	const { value, autoFocus, focusTrigger } = options;
 	const elementRef = (0, react.useRef)(null);
 	const cursorPosition = (0, react.useRef)(null);
-	const isFirstRender = (0, react.useRef)(true);
+	const prevFocusTriggerRef = (0, react.useRef)(focusTrigger);
 	const optionsRef = (0, react.useRef)(options);
 	optionsRef.current = options;
 	const ref = (0, react.useCallback)((node) => {
@@ -2571,10 +2571,8 @@ function useContentEditable(options) {
 		}
 	});
 	(0, react.useEffect)(() => {
-		if (isFirstRender.current) {
-			isFirstRender.current = false;
-			return;
-		}
+		if (prevFocusTriggerRef.current === focusTrigger) return;
+		prevFocusTriggerRef.current = focusTrigger;
 		elementRef.current?.focus();
 		const selection = globalThis.getSelection();
 		if (elementRef.current && selection) {
@@ -5785,37 +5783,32 @@ const NumberRendererComponent = (0, mobx_react_lite.observer)(({ node }) => {
 //#endregion
 //#region src/row-editor/ui/editors/FocusPopover.tsx
 const FocusPopover = ({ isOpen, setIsOpen, trigger, children, disabled, width }) => {
-	const triggerRef = (0, react.useRef)(null);
-	const lastRectRef = (0, react.useRef)(null);
-	const getAnchorRect = (0, react.useCallback)(() => {
-		const rect = triggerRef.current?.getBoundingClientRect();
-		if (rect && rect.width > 0) lastRectRef.current = rect;
-		return lastRectRef.current;
-	}, []);
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Box, {
-		ref: triggerRef,
-		onPointerDown: (0, react.useCallback)(() => {
-			if (!disabled) setIsOpen(true);
-		}, [disabled, setIsOpen]),
-		children: trigger
-	}), !disabled && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Popover.Root, {
+	const handleClick = (0, react.useCallback)(() => {
+		if (!disabled) setIsOpen(true);
+	}, [disabled, setIsOpen]);
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_chakra_ui_react.Popover.Root, {
 		lazyMount: true,
 		unmountOnExit: true,
 		open: isOpen,
-		onOpenChange: ({ open }) => setIsOpen(open),
+		onOpenChange: ({ open }) => {
+			if (!disabled) setIsOpen(open);
+		},
 		autoFocus: false,
-		closeOnInteractOutside: true,
+		closeOnInteractOutside: !disabled,
 		modal: false,
-		positioning: {
-			placement: "bottom-start",
-			getAnchorRect
-		},
-		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Portal, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Popover.Positioner, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Popover.Content, {
+		positioning: { placement: "bottom-start" },
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Popover.Trigger, {
+			asChild: true,
+			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Box, {
+				onClick: handleClick,
+				children: trigger
+			})
+		}), !disabled && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Portal, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Popover.Positioner, { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_chakra_ui_react.Popover.Content, {
 			width,
 			p: 1,
 			children
-		}) }) })
-	})] });
+		}) }) })]
+	});
 };
 
 //#endregion