@os-design/core 1.0.268 → 1.0.270

package/dist/InputNumber/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/InputNumber/index.tsx"],"names":[],"mappings":"AASA,OAAc,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAsB,EACpB,KAAK,iBAAiB,EACvB,MAAM,0BAA0B,CAAC;AAElC,MAAM,WAAW,gBACf,SAAQ,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,GAAG,UAAU,CAAC;IACvD;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,GAAG,GAAG,GAAG,CAAC;IAC7B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC;IAC5C;;;OAGG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CAC3C;AAOD;;GAEG;AACH,QAAA,MAAM,WAAW,+GAuHhB,CAAC;AAIF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/InputNumber/index.tsx"],"names":[],"mappings":"AASA,OAAc,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAsB,EACpB,KAAK,iBAAiB,EACvB,MAAM,0BAA0B,CAAC;AAElC,MAAM,WAAW,gBACf,SAAQ,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,GAAG,UAAU,CAAC;IACvD;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,GAAG,GAAG,GAAG,CAAC;IAC7B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,CAAC;IAC5C;;;OAGG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;CAC3C;AAOD;;GAEG;AACH,QAAA,MAAM,WAAW,+GAqIhB,CAAC;AAIF,eAAe,WAAW,CAAC"}

package/dist/InputNumber/index.js

@@ -1,6 +1,6 @@
 import { getNextCaret, getNextState, numberToFormattedString, useGetCaretWithinValue, useValidate } from '@os-design/input-number-utils';
 import { useForwardedRef } from '@os-design/utils';
-import { forwardRef, useEffect, useMemo, useState } from 'react';
+import { forwardRef, useEffect, useMemo, useRef, useState } from 'react';
 import Input from '../Input/index.js';
 import defaultLocale from './utils/defaultLocale.js';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -19,6 +19,8 @@ const InputNumber = /*#__PURE__*/forwardRef(({
   value = null,
   onChange = () => {},
   onSelect = () => {},
+  onFocus = () => {},
+  onBlur = () => {},
   ...rest
 }, ref) => {
   useValidate({
@@ -46,6 +48,7 @@ const InputNumber = /*#__PURE__*/forwardRef(({
     end: 0
   });
   const getCaretWithinValue = useGetCaretWithinValue(prefix, suffix);
+  const focusedRef = useRef(false);
 
   // Update the value
   useEffect(() => {
@@ -55,7 +58,9 @@ const InputNumber = /*#__PURE__*/forwardRef(({
   // Update the selection
   useEffect(() => {
     if (!inputRef.current) return;
-    inputRef.current.setSelectionRange(selection.start, selection.end);
+    if (focusedRef.current) {
+      inputRef.current.setSelectionRange(selection.start, selection.end);
+    }
   }, [inputRef, selection]);
   return /*#__PURE__*/_jsx(Input, {
     onSelect: e => {
@@ -72,6 +77,14 @@ const InputNumber = /*#__PURE__*/forwardRef(({
       });
       onSelect(e);
     },
+    onFocus: e => {
+      focusedRef.current = true;
+      onFocus(e);
+    },
+    onBlur: e => {
+      focusedRef.current = false;
+      onBlur(e);
+    },
     value: valueString,
     onChange: (v, e) => {
       // Get a new value as a string and number

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@os-design/core",
-  "version": "1.0.268",
+  "version": "1.0.270",
   "license": "UNLICENSED",
   "repository": "git@gitlab.com:os-team/libs/os-design.git",
   "type": "module",
@@ -39,7 +39,7 @@
     "@os-design/styles": "^1.0.65",
     "@os-design/theming": "^1.0.61",
     "@os-design/time-picker-utils": "^1.0.23",
-    "@os-design/utils": "^1.0.85",
+    "@os-design/utils": "^1.0.86",
     "facepaint": "^1.2.1",
     "react-focus-lock": "^2.13.2",
     "react-window": "^1.8.10"
@@ -58,5 +58,5 @@
     "react": "18",
     "react-dom": "18"
   },
-  "gitHead": "f0fa83bbb9597b879a8e1b421cc3d776dc370cc2"
+  "gitHead": "32672b12ae0a6483602c25f5bde36fac4a8fa64d"
 }

package/src/InputNumber/index.tsx

@@ -6,7 +6,7 @@ import {
   useValidate,
 } from '@os-design/input-number-utils';
 import { useForwardedRef } from '@os-design/utils';
-import { forwardRef, useEffect, useMemo, useState } from 'react';
+import { forwardRef, useEffect, useMemo, useRef, useState } from 'react';
 import Input, { type InputProps } from '../Input/index.js';
 import defaultLocale, {
   type InputNumberLocale,
@@ -89,6 +89,8 @@ const InputNumber = forwardRef<HTMLInputElement, InputNumberProps>(
       value = null,
       onChange = () => {},
       onSelect = () => {},
+      onFocus = () => {},
+      onBlur = () => {},
       ...rest
     },
     ref
@@ -131,6 +133,8 @@ const InputNumber = forwardRef<HTMLInputElement, InputNumberProps>(
     const [selection, setSelection] = useState<Selection>({ start: 0, end: 0 });
     const getCaretWithinValue = useGetCaretWithinValue(prefix, suffix);
 
+    const focusedRef = useRef(false);
+
     // Update the value
     useEffect(() => {
       setValueString(numberToFormattedString(value, options));
@@ -139,7 +143,9 @@ const InputNumber = forwardRef<HTMLInputElement, InputNumberProps>(
     // Update the selection
     useEffect(() => {
       if (!inputRef.current) return;
-      inputRef.current.setSelectionRange(selection.start, selection.end);
+      if (focusedRef.current) {
+        inputRef.current.setSelectionRange(selection.start, selection.end);
+      }
     }, [inputRef, selection]);
 
     return (
@@ -152,6 +158,14 @@ const InputNumber = forwardRef<HTMLInputElement, InputNumberProps>(
           setSelection({ start: selectionStart || 0, end: selectionEnd || 0 });
           onSelect(e);
         }}
+        onFocus={(e) => {
+          focusedRef.current = true;
+          onFocus(e);
+        }}
+        onBlur={(e) => {
+          focusedRef.current = false;
+          onBlur(e);
+        }}
         value={valueString}
         onChange={(v, e) => {
           // Get a new value as a string and number