@pushwoosh/smart-components-kit 1.3.21 → 1.3.22

package/DynamicContentPickerForm/SimpleDynamicContentPickerFormSmart.js

@@ -1,14 +1,16 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect } from 'react';
-import { FieldBox, NativeInput, Select, Spinner } from '@pushwoosh/dumb-components';
+import { Combobox, FieldBox, NativeInput, Spinner } from '@pushwoosh/dumb-components';
 import { Horizontal, Vertical } from '@pushwoosh/kit-helpers';
 import { useDynamicContentTags } from './hooks';
 import { useLang } from './polyglot';
 import { SimpleTagPickerDiv } from './styled';
-import { buildOptions } from './utils';
+import { allDynamicContentModifiers, buildOptions } from './utils';
+const defaultModifier = 'regular';
+const matchesQuery = (value, query) => value.toLowerCase().includes(query.trim().toLowerCase());
 const defaultDynamicContent = {
   tagName: '',
-  modifier: 'regular',
+  modifier: defaultModifier,
   defaultValue: ''
 };
 export const SimpleDynamicContentPickerFormSmart = ({
@@ -37,10 +39,19 @@ export const SimpleDynamicContentPickerFormSmart = ({
     });
   }
   const options = buildOptions(systemVariables ?? [], asyncResult.value || []);
-  const selectedTag = options.find(option => option.name === dc.tagName) || {
-    name: '',
-    label: '',
-    modifiers: ['regular']
+  const pickedOption = options.find(option => option.name === dc.tagName);
+  const modifiers = pickedOption?.modifiers ?? allDynamicContentModifiers;
+  const isEmpty = !dc.tagName.trim();
+  const labelOf = name => options.find(option => option.name === name)?.label ?? name;
+  const changeTagName = (tagName, isPicked) => {
+    const option = options.find(item => item.name === tagName);
+    const nextModifiers = option?.modifiers ?? allDynamicContentModifiers;
+    const keepModifier = !isPicked && nextModifiers.includes(dc.modifier);
+    onChange({
+      tagName,
+      modifier: keepModifier ? dc.modifier : nextModifiers[0] ?? defaultModifier,
+      defaultValue: isPicked ? '' : dc.defaultValue
+    });
   };
   return _jsxs(SimpleTagPickerDiv, {
     children: [_jsx(FieldBox, {
@@ -49,43 +60,30 @@ export const SimpleDynamicContentPickerFormSmart = ({
       }),
       children: _jsxs(Vertical, {
         "$gap": 8,
-        children: [_jsx(Select, {
-          width: "auto",
-          menuPlacement: "auto",
-          value: {
-            value: dc.tagName,
-            label: selectedTag.name ? selectedTag.label : dc.tagName
-          },
-          onChange: option => {
-            const picked = options.find(item => item.name === option.value);
-            onChange({
-              tagName: option.value,
-              modifier: picked?.modifiers[0] ?? 'regular',
-              defaultValue: ''
-            });
-          },
-          options: options.map(option => ({
-            value: option.name,
-            label: option.label
-          }))
-        }), _jsx(Select, {
-          width: "auto",
-          menuPlacement: "auto",
-          value: {
-            value: dc.modifier,
-            label: dc.modifier
-          },
-          onChange: option => {
+        children: [_jsx(Combobox, {
+          value: dc.tagName,
+          onChange: (value, meta) => changeTagName(value, meta.source === 'select'),
+          items: options.map(option => option.name),
+          getLabel: name => name,
+          renderItem: name => labelOf(name),
+          filter: (name, query) => matchesQuery(name, query) || matchesQuery(labelOf(name), query),
+          placeholder: lang({
+            message: 'SMART.DYNAMIC_CONTENT_PICKER_FORM.TAG.PLACEHOLDER'
+          }),
+          fullWidth: true
+        }), _jsx(Combobox, {
+          select: true,
+          value: dc.modifier || null,
+          onChange: modifier => {
             onChange({
               ...dc,
-              modifier: option.value
+              modifier: modifier ?? ''
             });
           },
-          options: selectedTag.modifiers.map(modifier => ({
-            value: modifier,
-            label: modifier
-          })),
-          isDisabled: !selectedTag.name
+          items: modifiers,
+          getLabel: modifier => modifier,
+          disabled: isEmpty,
+          fullWidth: true
         })]
       })
     }), _jsx(FieldBox, {
@@ -100,7 +98,7 @@ export const SimpleDynamicContentPickerFormSmart = ({
             defaultValue: e.target.value
           });
         },
-        disabled: !selectedTag.name
+        disabled: isEmpty
       })
     }), children]
   });

package/DynamicContentPickerForm/utils.d.ts

@@ -1,3 +1,4 @@
 import { type FullTagData, type PickerOption, type SystemVariable, type VariedDynamicContent } from './types';
 export declare function buildOptions(systemVariables: SystemVariable[], tags: FullTagData[]): PickerOption[];
 export declare function createDefaultDynamicContent(kind: 'tag' | 'event' | 'customText'): VariedDynamicContent;
+export declare const allDynamicContentModifiers: string[];

package/DynamicContentPickerForm/utils.js

@@ -1,3 +1,4 @@
+import { DynamicContentModifiers } from '@pushwoosh/kit-constants';
 export function buildOptions(systemVariables, tags) {
   const taken = new Set(systemVariables.map(v => v.name));
   const system = systemVariables.map(v => ({
@@ -40,4 +41,5 @@ export function createDefaultDynamicContent(kind) {
         }
       };
   }
-}
+}
+export const allDynamicContentModifiers = [...DynamicContentModifiers.string, ...DynamicContentModifiers.integer.filter(modifier => !DynamicContentModifiers.string.includes(modifier))];

package/RichMessageEditorSmart/NewDynamicContentForm.js

@@ -21,7 +21,7 @@ export const NewDynamicContentForm = ({
       children: _jsx(Button, {
         color: "secondary",
         onClick: () => onSubmit(dc),
-        isDisabled: !dc,
+        isDisabled: !dc?.tagName.trim(),
         children: lang({
           message: 'SMART.RICH_MESSAGE_EDITOR.INSERT'
         })

package/package.json

@@ -54,5 +54,5 @@
     "react": "^16.14.0 || ^18.0.0",
     "react-dom": "^16.14.0 || ^18.0.0"
   },
-  "version": "1.3.21"
+  "version": "1.3.22"
 }