@akinon/akifilter 1.2.0-next.7 → 1.2.0-next.9

package/dist/cjs/akifilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"akifilter.d.ts","sourceRoot":"","sources":["../../src/akifilter.tsx"],"names":[],"mappings":"AAAA,OAAO,cAAc,CAAC;AAGtB,OAAO,EAIL,WAAW,EAEX,IAAI,EAGL,MAAM,iBAAiB,CAAC;AAWzB,OAAO,KAAK,MAAM,OAAO,CAAC;AA0B1B,OAAO,KAAK,EAAkB,eAAe,EAAE,MAAM,SAAS,CAAC;AAY/D,KAAK,oBAAoB,GAAG,WAAW,CAAC;AA2DxC,MAAM,MAAM,cAAc,CACxB,YAAY,SAAS,oBAAoB,GAAG,oBAAoB,IAC9D;IACF;;OAEG;IACH,YAAY,CAAC,EAAE,eAAe,CAAC,YAAY,CAAC,CAAC;IAC7C;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IACtC;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC;IACzD;;OAEG;IACH,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,IAAI,CAAC;IAClE;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAkvBF,eAAO,MAAM,SAAS;KACpB,YAAY,SAAS,oBAAoB,uBAElC,cAAc,CAAC,YAAY,CAAC;;CAmBpC,CAAC"}
+{"version":3,"file":"akifilter.d.ts","sourceRoot":"","sources":["../../src/akifilter.tsx"],"names":[],"mappings":"AAAA,OAAO,cAAc,CAAC;AAGtB,OAAO,EAIL,WAAW,EACX,IAAI,EAIL,MAAM,iBAAiB,CAAC;AAWzB,OAAO,KAAK,MAAM,OAAO,CAAC;AA0B1B,OAAO,KAAK,EAAkB,eAAe,EAAE,MAAM,SAAS,CAAC;AAY/D,KAAK,oBAAoB,GAAG,WAAW,CAAC;AA0HxC,MAAM,MAAM,cAAc,CACxB,YAAY,SAAS,oBAAoB,GAAG,oBAAoB,IAC9D;IACF;;OAEG;IACH,YAAY,CAAC,EAAE,eAAe,CAAC,YAAY,CAAC,CAAC;IAC7C;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IACtC;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC;IACzD;;OAEG;IACH,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,IAAI,CAAC;IAClE;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AA2vBF,eAAO,MAAM,SAAS;KACpB,YAAY,SAAS,oBAAoB,uBAElC,cAAc,CAAC,YAAY,CAAC;;CAmBpC,CAAC"}

package/dist/cjs/akifilter.js

@@ -37,6 +37,32 @@ const use_debounced_value_1 = require("./hooks/use-debounced-value");
 const i18n_1 = require("./i18n");
 const schema_1 = require("./utils/schema");
 const values_1 = require("./utils/values");
+const FilterFormItem = (_a) => {
+    var _b, _c;
+    var { children, control, name, valuePropName } = _a, props = __rest(_a, ["children", "control", "name", "valuePropName"]);
+    const { field, fieldState } = (0, akiform_1.useController)({ name, control });
+    const childrenWithProps = react_1.default.Children.map(children, child => {
+        if (react_1.default.isValidElement(child)) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const typedChild = child;
+            return react_1.default.cloneElement(typedChild, Object.assign(Object.assign(Object.assign({}, field), { 
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                onChange: (...params) => {
+                    var _a, _b;
+                    (_b = (_a = typedChild.props).onChange) === null || _b === void 0 ? void 0 : _b.call(_a, params);
+                    field.onChange(...params);
+                }, onBlur: () => {
+                    var _a, _b;
+                    (_b = (_a = typedChild.props).onBlur) === null || _b === void 0 ? void 0 : _b.call(_a);
+                    field.onBlur();
+                }, ref: undefined }), (valuePropName && {
+                [valuePropName]: field.value
+            })));
+        }
+        return child;
+    });
+    return (react_1.default.createElement(akiform_1.Akiform.Item, Object.assign({}, props, { validateStatus: fieldState.invalid ? 'error' : undefined, help: (_c = (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : props.help, className: props.className }), childrenWithProps));
+};
 /**
  * Checks if a field should be disabled based on config.disabled property.
  */
@@ -187,14 +213,20 @@ const AkifilterContent = ({ filterSchema, storageNamespace, defaultValues, onVal
         (0, storage_1.writeVisibleKeys)(storageKey, visibleKeys);
         onVisibleFieldsChange === null || onVisibleFieldsChange === void 0 ? void 0 : onVisibleFieldsChange(visibleKeys);
     }, [visibleKeys, onVisibleFieldsChange, storageKey]);
-    // Track if this is the initial mount to avoid unnecessary reset
-    const isInitialMountRef = react_1.default.useRef(true);
+    // Track previous mergedDefaultValues to avoid unnecessary resets
+    const previousMergedDefaultValuesRef = react_1.default.useRef(null);
     react_1.default.useEffect(() => {
+        const serialised = JSON.stringify(mergedDefaultValues);
+        // Skip if the values haven't actually changed (deep comparison)
+        if (previousMergedDefaultValuesRef.current === serialised) {
+            return;
+        }
         // Skip reset on initial mount - useForm already uses defaultValues
-        if (isInitialMountRef.current) {
-            isInitialMountRef.current = false;
+        if (previousMergedDefaultValuesRef.current === null) {
+            previousMergedDefaultValuesRef.current = serialised;
             return;
         }
+        previousMergedDefaultValuesRef.current = serialised;
         formMethods.reset(mergedDefaultValues);
     }, [formMethods, mergedDefaultValues]);
     const normalisedValues = react_1.default.useMemo(() => (0, values_1.normaliseOutputValues)(flattenedSchema, formValues), [flattenedSchema, formValues]);
@@ -426,7 +458,7 @@ const AkifilterContent = ({ filterSchema, storageNamespace, defaultValues, onVal
         }
     };
     const renderFormField = (field) => {
-        return (react_1.default.createElement(akiform_1.FormItem, { key: String(field.key), control: formMethods.control, name: field.key, tooltip: field.tooltip, help: field.help, labelDescription: field.labelDescription, required: Boolean(field.validation), className: "mb-0", valuePropName: field.type === 'checkbox' ? 'checked' : undefined }, renderFieldComponent(field)));
+        return (react_1.default.createElement(FilterFormItem, { key: String(field.key), control: formMethods.control, name: field.key, tooltip: field.tooltip, help: field.help, labelDescription: field.labelDescription, required: Boolean(field.validation), className: "mb-0", valuePropName: field.type === 'checkbox' ? 'checked' : undefined }, renderFieldComponent(field)));
     };
     return (react_1.default.createElement(ui_card_1.Card, { size: "small", className: "akinon-filter shadow", "data-testid": "akifilter-root" },
         react_1.default.createElement(antd_1.ConfigProvider, { theme: theme_overrides_1.themeOverrides },

package/dist/esm/akifilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"akifilter.d.ts","sourceRoot":"","sources":["../../src/akifilter.tsx"],"names":[],"mappings":"AAAA,OAAO,cAAc,CAAC;AAGtB,OAAO,EAIL,WAAW,EAEX,IAAI,EAGL,MAAM,iBAAiB,CAAC;AAWzB,OAAO,KAAK,MAAM,OAAO,CAAC;AA0B1B,OAAO,KAAK,EAAkB,eAAe,EAAE,MAAM,SAAS,CAAC;AAY/D,KAAK,oBAAoB,GAAG,WAAW,CAAC;AA2DxC,MAAM,MAAM,cAAc,CACxB,YAAY,SAAS,oBAAoB,GAAG,oBAAoB,IAC9D;IACF;;OAEG;IACH,YAAY,CAAC,EAAE,eAAe,CAAC,YAAY,CAAC,CAAC;IAC7C;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IACtC;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC;IACzD;;OAEG;IACH,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,IAAI,CAAC;IAClE;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAkvBF,eAAO,MAAM,SAAS;KACpB,YAAY,SAAS,oBAAoB,uBAElC,cAAc,CAAC,YAAY,CAAC;;CAmBpC,CAAC"}
+{"version":3,"file":"akifilter.d.ts","sourceRoot":"","sources":["../../src/akifilter.tsx"],"names":[],"mappings":"AAAA,OAAO,cAAc,CAAC;AAGtB,OAAO,EAIL,WAAW,EACX,IAAI,EAIL,MAAM,iBAAiB,CAAC;AAWzB,OAAO,KAAK,MAAM,OAAO,CAAC;AA0B1B,OAAO,KAAK,EAAkB,eAAe,EAAE,MAAM,SAAS,CAAC;AAY/D,KAAK,oBAAoB,GAAG,WAAW,CAAC;AA0HxC,MAAM,MAAM,cAAc,CACxB,YAAY,SAAS,oBAAoB,GAAG,oBAAoB,IAC9D;IACF;;OAEG;IACH,YAAY,CAAC,EAAE,eAAe,CAAC,YAAY,CAAC,CAAC;IAC7C;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IACtC;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC;IACzD;;OAEG;IACH,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,KAAK,IAAI,CAAC;IAClE;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AA2vBF,eAAO,MAAM,SAAS;KACpB,YAAY,SAAS,oBAAoB,uBAElC,cAAc,CAAC,YAAY,CAAC;;CAmBpC,CAAC"}

package/dist/esm/akifilter.js

@@ -11,7 +11,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import './styles.css';
 import { akidate } from '@akinon/akidate';
-import { Akiform, FormItem, useForm, useWatch } from '@akinon/akiform';
+import { Akiform, useController, useForm, useWatch } from '@akinon/akiform';
 import { Button } from '@akinon/ui-button';
 import { Card } from '@akinon/ui-card';
 import { Checkbox } from '@akinon/ui-checkbox';
@@ -34,6 +34,32 @@ import { useDebouncedValue } from './hooks/use-debounced-value';
 import { i18n } from './i18n';
 import { deriveDefaultVisibleKeys, ensureSchemaOrder, extractDefaultValues, flattenSchema, getFieldAriaLabel, normaliseValuesBySchema, partitionSchema } from './utils/schema';
 import { normaliseOutputValues } from './utils/values';
+const FilterFormItem = (_a) => {
+    var _b, _c;
+    var { children, control, name, valuePropName } = _a, props = __rest(_a, ["children", "control", "name", "valuePropName"]);
+    const { field, fieldState } = useController({ name, control });
+    const childrenWithProps = React.Children.map(children, child => {
+        if (React.isValidElement(child)) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const typedChild = child;
+            return React.cloneElement(typedChild, Object.assign(Object.assign(Object.assign({}, field), { 
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                onChange: (...params) => {
+                    var _a, _b;
+                    (_b = (_a = typedChild.props).onChange) === null || _b === void 0 ? void 0 : _b.call(_a, params);
+                    field.onChange(...params);
+                }, onBlur: () => {
+                    var _a, _b;
+                    (_b = (_a = typedChild.props).onBlur) === null || _b === void 0 ? void 0 : _b.call(_a);
+                    field.onBlur();
+                }, ref: undefined }), (valuePropName && {
+                [valuePropName]: field.value
+            })));
+        }
+        return child;
+    });
+    return (React.createElement(Akiform.Item, Object.assign({}, props, { validateStatus: fieldState.invalid ? 'error' : undefined, help: (_c = (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : props.help, className: props.className }), childrenWithProps));
+};
 /**
  * Checks if a field should be disabled based on config.disabled property.
  */
@@ -184,14 +210,20 @@ const AkifilterContent = ({ filterSchema, storageNamespace, defaultValues, onVal
         writeVisibleKeys(storageKey, visibleKeys);
         onVisibleFieldsChange === null || onVisibleFieldsChange === void 0 ? void 0 : onVisibleFieldsChange(visibleKeys);
     }, [visibleKeys, onVisibleFieldsChange, storageKey]);
-    // Track if this is the initial mount to avoid unnecessary reset
-    const isInitialMountRef = React.useRef(true);
+    // Track previous mergedDefaultValues to avoid unnecessary resets
+    const previousMergedDefaultValuesRef = React.useRef(null);
     React.useEffect(() => {
+        const serialised = JSON.stringify(mergedDefaultValues);
+        // Skip if the values haven't actually changed (deep comparison)
+        if (previousMergedDefaultValuesRef.current === serialised) {
+            return;
+        }
         // Skip reset on initial mount - useForm already uses defaultValues
-        if (isInitialMountRef.current) {
-            isInitialMountRef.current = false;
+        if (previousMergedDefaultValuesRef.current === null) {
+            previousMergedDefaultValuesRef.current = serialised;
             return;
         }
+        previousMergedDefaultValuesRef.current = serialised;
         formMethods.reset(mergedDefaultValues);
     }, [formMethods, mergedDefaultValues]);
     const normalisedValues = React.useMemo(() => normaliseOutputValues(flattenedSchema, formValues), [flattenedSchema, formValues]);
@@ -423,7 +455,7 @@ const AkifilterContent = ({ filterSchema, storageNamespace, defaultValues, onVal
         }
     };
     const renderFormField = (field) => {
-        return (React.createElement(FormItem, { key: String(field.key), control: formMethods.control, name: field.key, tooltip: field.tooltip, help: field.help, labelDescription: field.labelDescription, required: Boolean(field.validation), className: "mb-0", valuePropName: field.type === 'checkbox' ? 'checked' : undefined }, renderFieldComponent(field)));
+        return (React.createElement(FilterFormItem, { key: String(field.key), control: formMethods.control, name: field.key, tooltip: field.tooltip, help: field.help, labelDescription: field.labelDescription, required: Boolean(field.validation), className: "mb-0", valuePropName: field.type === 'checkbox' ? 'checked' : undefined }, renderFieldComponent(field)));
     };
     return (React.createElement(Card, { size: "small", className: "akinon-filter shadow", "data-testid": "akifilter-root" },
         React.createElement(ConfigProvider, { theme: themeOverrides },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/akifilter",
-  "version": "1.2.0-next.7",
+  "version": "1.2.0-next.9",
   "private": false,
   "description": "Akifilter is a filtering library for Akinon frontend applications.",
   "type": "module",
@@ -12,21 +12,21 @@
   "dependencies": {
     "antd": "^5.27.0",
     "react-error-boundary": "^6.0.0",
-    "@akinon/akidate": "1.1.3-next.0",
+    "@akinon/ui-card": "1.1.3-next.1",
     "@akinon/akiform": "1.1.2",
     "@akinon/akilocale": "1.2.1",
-    "@akinon/icons": "1.1.2-next.1",
+    "@akinon/ui-button": "1.4.0-next.1",
     "@akinon/ui-checkbox": "1.3.3-next.1",
-    "@akinon/ui-card": "1.1.3-next.1",
+    "@akinon/akidate": "1.1.3-next.0",
+    "@akinon/ui-input": "1.1.3-next.1",
     "@akinon/ui-collapse": "1.3.2-next.1",
-    "@akinon/ui-button": "1.4.0-next.1",
-    "@akinon/ui-date-picker": "1.3.3-next.1",
     "@akinon/ui-input-number": "1.3.3-next.1",
     "@akinon/ui-modal": "1.1.3-next.1",
-    "@akinon/ui-input": "1.1.3-next.1",
-    "@akinon/ui-pagination": "1.3.4-next.1",
-    "@akinon/ui-select": "1.3.4-next.1",
     "@akinon/ui-typography": "1.1.2-next.0",
+    "@akinon/ui-date-picker": "1.3.3-next.1",
+    "@akinon/ui-select": "1.3.4-next.1",
+    "@akinon/ui-pagination": "1.3.4-next.1",
+    "@akinon/icons": "1.1.2-next.1",
     "@akinon/ui-space": "1.3.3-next.1"
   },
   "devDependencies": {
@@ -37,8 +37,8 @@
     "@akinon/akiform-builder": "1.3.5-next.1",
     "@akinon/typescript-config": "1.1.1",
     "@akinon/ui-theme": "1.1.3-next.1",
-    "@akinon/vitest-config": "1.1.1",
-    "@akinon/utils": "1.1.4-next.1"
+    "@akinon/utils": "1.1.4-next.1",
+    "@akinon/vitest-config": "1.1.1"
   },
   "peerDependencies": {
     "react": "^18 || ^19",