@redneckz/wildless-cms-uni-blocks 0.14.1052 → 0.14.1053

package/mobile/dist/retail/components/Fields/SelectField.js

@@ -1,6 +1,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectField = void 0;
 const jsx_runtime_1 = require("@redneckz/uni-jsx/jsx-runtime");
+const hooks_1 = require("@redneckz/uni-jsx/lib/hooks");
 const SelectControl_1 = require("../../../ui-kit/Select/SelectControl");
 const UniBlock_1 = require("../../../UniBlock/UniBlock");
 exports.SelectField = (0, UniBlock_1.UniBlock)(({ field, source, fieldName, placeholder = 'Выберите из списка', 
@@ -10,6 +11,14 @@ options, onChange, ...rest }) => {
         key: _.key || '',
         text: _.value,
     })) || [];
-    return ((0, jsx_runtime_1.jsx)(SelectControl_1.SelectControl, { placeholder: placeholder, options: leadOptions, ...field(fieldName), ...rest, onChange: onChange ?? field(fieldName)?.onChange }));
+    const fieldProps = field(fieldName);
+    const currentValue = fieldProps?.value;
+    const updateValue = (0, hooks_1.useMemo)(() => {
+        if (currentValue?.key && !currentValue?.text) {
+            return leadOptions.find((opt) => opt.key === currentValue.key) ?? currentValue;
+        }
+        return currentValue;
+    }, [currentValue, leadOptions]);
+    return ((0, jsx_runtime_1.jsx)(SelectControl_1.SelectControl, { placeholder: placeholder, options: leadOptions, ...field(fieldName), value: updateValue, ...rest, onChange: onChange ?? field(fieldName)?.onChange }));
 });
 //# sourceMappingURL=SelectField.js.map

package/mobile/dist/retail/components/Fields/SelectField.js.map

@@ -1 +1 @@
-{"version":3,"file":"SelectField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/SelectField.tsx"],"names":[],"mappings":";;;AAKA,wEAAqE;AACrE,yDAAsD;AAiBzC,QAAA,WAAW,GAAG,IAAA,mBAAQ,EACjC,CAAC,EACC,KAAK,EACL,MAAM,EACN,SAAS,EACT,WAAW,GAAG,oBAAoB;AAClC,6DAA6D;AAC7D,OAAO,EACP,QAAQ,EACR,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,WAAW,GACf,MAAM,EAAE,GAAG,CAAC,CAAC,CAAiB,EAAE,EAAE,CAAC,CAAC;QAClC,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE;QAChB,IAAI,EAAE,CAAC,CAAC,KAAK;KACd,CAAC,CAAC,IAAI,EAAE,CAAC;IAEZ,OAAO,CACL,uBAAC,6BAAa,IACZ,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,WAAW,KAChB,KAAK,CAAC,SAAS,CAAC,KAChB,IAAI,EACR,QAAQ,EAAE,QAAQ,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,QAAQ,GAChD,CACH,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"SelectField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/SelectField.tsx"],"names":[],"mappings":";;;AAAA,uDAAsD;AAMtD,wEAAqE;AACrE,yDAAsD;AAiBzC,QAAA,WAAW,GAAG,IAAA,mBAAQ,EACjC,CAAC,EACC,KAAK,EACL,MAAM,EACN,SAAS,EACT,WAAW,GAAG,oBAAoB;AAClC,6DAA6D;AAC7D,OAAO,EACP,QAAQ,EACR,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,WAAW,GACf,MAAM,EAAE,GAAG,CAAC,CAAC,CAAiB,EAAE,EAAE,CAAC,CAAC;QAClC,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE;QAChB,IAAI,EAAE,CAAC,CAAC,KAAK;KACd,CAAC,CAAC,IAAI,EAAE,CAAC;IAEZ,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,UAAU,EAAE,KAA2B,CAAC;IAE7D,MAAM,WAAW,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAC/B,IAAI,YAAY,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE;YAC5C,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,YAAY,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC;SAChF;QAED,OAAO,YAAY,CAAC;IACtB,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;IAEhC,OAAO,CACL,uBAAC,6BAAa,IACZ,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,WAAW,KAChB,KAAK,CAAC,SAAS,CAAC,EACpB,KAAK,EAAE,WAAW,KACd,IAAI,EACR,QAAQ,EAAE,QAAQ,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,QAAQ,GAChD,CACH,CAAC;AACJ,CAAC,CACF,CAAC"}

package/mobile/lib/retail/components/Fields/SelectField.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { SelectControl } from '../../../ui-kit/Select/SelectControl.js';
 import { UniBlock } from '../../../UniBlock/UniBlock.js';
 export const SelectField = UniBlock(({ field, source, fieldName, placeholder = 'Выберите из списка', 
@@ -8,6 +9,14 @@ options, onChange, ...rest }) => {
         key: _.key || '',
         text: _.value,
     })) || [];
-    return (_jsx(SelectControl, { placeholder: placeholder, options: leadOptions, ...field(fieldName), ...rest, onChange: onChange ?? field(fieldName)?.onChange }));
+    const fieldProps = field(fieldName);
+    const currentValue = fieldProps?.value;
+    const updateValue = useMemo(() => {
+        if (currentValue?.key && !currentValue?.text) {
+            return leadOptions.find((opt) => opt.key === currentValue.key) ?? currentValue;
+        }
+        return currentValue;
+    }, [currentValue, leadOptions]);
+    return (_jsx(SelectControl, { placeholder: placeholder, options: leadOptions, ...field(fieldName), value: updateValue, ...rest, onChange: onChange ?? field(fieldName)?.onChange }));
 });
 //# sourceMappingURL=SelectField.js.map

package/mobile/lib/retail/components/Fields/SelectField.js.map

@@ -1 +1 @@
-{"version":3,"file":"SelectField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/SelectField.tsx"],"names":[],"mappings":";AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAiBtD,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CACjC,CAAC,EACC,KAAK,EACL,MAAM,EACN,SAAS,EACT,WAAW,GAAG,oBAAoB;AAClC,6DAA6D;AAC7D,OAAO,EACP,QAAQ,EACR,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,WAAW,GACf,MAAM,EAAE,GAAG,CAAC,CAAC,CAAiB,EAAE,EAAE,CAAC,CAAC;QAClC,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE;QAChB,IAAI,EAAE,CAAC,CAAC,KAAK;KACd,CAAC,CAAC,IAAI,EAAE,CAAC;IAEZ,OAAO,CACL,KAAC,aAAa,IACZ,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,WAAW,KAChB,KAAK,CAAC,SAAS,CAAC,KAChB,IAAI,EACR,QAAQ,EAAE,QAAQ,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,QAAQ,GAChD,CACH,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"SelectField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/SelectField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAMtD,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAiBtD,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CACjC,CAAC,EACC,KAAK,EACL,MAAM,EACN,SAAS,EACT,WAAW,GAAG,oBAAoB;AAClC,6DAA6D;AAC7D,OAAO,EACP,QAAQ,EACR,GAAG,IAAI,EACR,EAAE,EAAE;IACH,MAAM,WAAW,GACf,MAAM,EAAE,GAAG,CAAC,CAAC,CAAiB,EAAE,EAAE,CAAC,CAAC;QAClC,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE;QAChB,IAAI,EAAE,CAAC,CAAC,KAAK;KACd,CAAC,CAAC,IAAI,EAAE,CAAC;IAEZ,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,UAAU,EAAE,KAA2B,CAAC;IAE7D,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE;QAC/B,IAAI,YAAY,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE;YAC5C,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,YAAY,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC;SAChF;QAED,OAAO,YAAY,CAAC;IACtB,CAAC,EAAE,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;IAEhC,OAAO,CACL,KAAC,aAAa,IACZ,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,WAAW,KAChB,KAAK,CAAC,SAAS,CAAC,EACpB,KAAK,EAAE,WAAW,KACd,IAAI,EACR,QAAQ,EAAE,QAAQ,IAAI,KAAK,CAAC,SAAS,CAAC,EAAE,QAAQ,GAChD,CACH,CAAC;AACJ,CAAC,CACF,CAAC"}

package/mobile/src/retail/components/Fields/SelectField.tsx

@@ -1,3 +1,4 @@
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { type DisabledProps } from '../../../model/DisabledProps';
 import { type LabelProps } from '../../../model/HeadlineType';
 import { type PlaceholderProps } from '../../../model/PlaceholderProps';
@@ -38,11 +39,23 @@ export const SelectField = UniBlock<SelectFieldProps>(
         text: _.value,
       })) || [];
 
+    const fieldProps = field(fieldName);
+    const currentValue = fieldProps?.value as Option | undefined;
+
+    const updateValue = useMemo(() => {
+      if (currentValue?.key && !currentValue?.text) {
+        return leadOptions.find((opt) => opt.key === currentValue.key) ?? currentValue;
+      }
+
+      return currentValue;
+    }, [currentValue, leadOptions]);
+
     return (
       <SelectControl
         placeholder={placeholder}
         options={leadOptions}
         {...field(fieldName)}
+        value={updateValue}
         {...rest}
         onChange={onChange ?? field(fieldName)?.onChange}
       />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.1052",
+  "version": "0.14.1053",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/retail/components/Fields/SelectField.tsx

@@ -1,3 +1,4 @@
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { type DisabledProps } from '../../../model/DisabledProps';
 import { type LabelProps } from '../../../model/HeadlineType';
 import { type PlaceholderProps } from '../../../model/PlaceholderProps';
@@ -38,11 +39,23 @@ export const SelectField = UniBlock<SelectFieldProps>(
         text: _.value,
       })) || [];
 
+    const fieldProps = field(fieldName);
+    const currentValue = fieldProps?.value as Option | undefined;
+
+    const updateValue = useMemo(() => {
+      if (currentValue?.key && !currentValue?.text) {
+        return leadOptions.find((opt) => opt.key === currentValue.key) ?? currentValue;
+      }
+
+      return currentValue;
+    }, [currentValue, leadOptions]);
+
     return (
       <SelectControl
         placeholder={placeholder}
         options={leadOptions}
         {...field(fieldName)}
+        value={updateValue}
         {...rest}
         onChange={onChange ?? field(fieldName)?.onChange}
       />