@antscorp/antsomi-ui 1.3.5-beta.165 → 1.3.5-beta.166

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/es/components/molecules/TemplateSaveAs/TemplateSaveAs.js +46 -19
  2. package/package.json +1 -1
package/es/components/molecules/TemplateSaveAs/TemplateSaveAs.js CHANGED
@@ -35,9 +35,11 @@ export const TemplateSaveAs = props => {
35
35
  const { isLoading, label: templateLabel, defaultNewTemplateName = `Untitled Media Template#${dayjs().format('YYYY-MM-DD HH:mm:ss')}`, selectPlaceholder = 'Please select an item', placeholder = 'Enter your media template name', validateName, onSearch, onNamePopupScroll, onScrollToBottom, } = templateNamesOptions || {};
36
36
  const { label: descriptionLabel, placeholder: descriptionPlaceholder } = descriptionOptions || {};
37
37
  const { saveNewText = 'Save as a new media template', saveExistText = 'Save as an existing media template', saveNewValue = 'save-new', saveExistValue = 'save-exist', } = saveOptions || {};
38
- const { saveOption = saveNewValue, templateName = saveOption === saveNewValue || !saveOption
39
- ? { id: undefined, label: defaultNewTemplateName }
40
- : templateNameList === null || templateNameList === void 0 ? void 0 : templateNameList[0], description: defaultTemplateDesc, defaultThumbnail = 0, categories: categoriesValue = {}, accessInfo, } = value || {};
38
+ const { saveOption = saveNewValue,
39
+ // templateName = saveOption === saveNewValue || !saveOption
40
+ // ? { id: undefined, label: defaultNewTemplateName }
41
+ // : templateNameList?.[0],
42
+ templateName, description: defaultTemplateDesc, defaultThumbnail = 0, categories: categoriesValue = {}, accessInfo, } = value || {};
41
43
  const initFormValue = {
42
44
  saveOption,
43
45
  templateName: defaultNewTemplateName,
@@ -53,19 +55,37 @@ export const TemplateSaveAs = props => {
53
55
  if (searchValueDebounce && onSearch)
54
56
  onSearch(searchValueDebounce);
55
57
  }, [searchValueDebounce, onSearch]);
58
+ // useEffect(() => {
59
+ // /**
60
+ // * Check if saveOption is save-new and onChange and defaultNewTemplateName changed
61
+ // * => set templateName to new default template name { id: undefined, label: defaultNewTemplateName }
62
+ // */
63
+ // if (saveOption === saveNewValue && onChange) {
64
+ // onChange({
65
+ // ...value,
66
+ // templateName: { id: templateName?.id, label: defaultNewTemplateName },
67
+ // });
68
+ // }
69
+ // // eslint-disable-next-line react-hooks/exhaustive-deps
70
+ // }, [defaultNewTemplateName, saveNewValue, saveOption]);
56
71
  useEffect(() => {
57
- /**
58
- * Check if saveOption is save-new and onChange and defaultNewTemplateName changed
59
- * => set templateName to new default template name { id: undefined, label: defaultNewTemplateName }
60
- */
61
- if (saveOption === saveNewValue && onChange) {
62
- onChange(Object.assign(Object.assign({}, value), { templateName: { id: templateName === null || templateName === void 0 ? void 0 : templateName.id, label: defaultNewTemplateName } }));
72
+ if (saveOption === saveNewValue && onChange && !(templateName === null || templateName === void 0 ? void 0 : templateName.label)) {
73
+ const newDefaultTemplateName = `Untitled Template#${dayjs().format('YYYY-MM-DD HH:mm:ss')}`;
74
+ onChange(Object.assign(Object.assign({}, value), { templateName: { id: templateName === null || templateName === void 0 ? void 0 : templateName.id, label: newDefaultTemplateName } }));
63
75
  }
64
76
  // eslint-disable-next-line react-hooks/exhaustive-deps
65
- }, [defaultNewTemplateName, saveNewValue, saveOption]);
77
+ }, [saveOption, templateName]);
66
78
  useDeepCompareEffect(() => {
67
- form.setFieldsValue(initFormValue);
68
- }, [form, initFormValue]);
79
+ var _a;
80
+ form.setFieldsValue({
81
+ saveOption,
82
+ templateName: templateName === null || templateName === void 0 ? void 0 : templateName.label,
83
+ templateNameSelect: (templateName === null || templateName === void 0 ? void 0 : templateName.id) || ((_a = templateNameList === null || templateNameList === void 0 ? void 0 : templateNameList[0]) === null || _a === void 0 ? void 0 : _a.id),
84
+ description: defaultTemplateDesc || '',
85
+ categories: categoriesValue,
86
+ defaultThumbnail,
87
+ });
88
+ }, [form, value]);
69
89
  const handleChangeValue = (newValue) => {
70
90
  if (onEvent) {
71
91
  onEvent(newValue);
@@ -112,11 +132,18 @@ export const TemplateSaveAs = props => {
112
132
  const { value } = e.target;
113
133
  // Change save option
114
134
  const cloneTemplateName = cloneDeep(templateName);
115
- console.log('🚀 ~ cloneTemplateName:', cloneTemplateName);
116
- if (value === saveExistValue) {
117
- const selectedTemplate = templateNameList === null || templateNameList === void 0 ? void 0 : templateNameList.find(item => item.id === templateName.id);
118
- // Check current template id is exist or not, if not then select first
119
- cloneTemplateName.id = (selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.id) || ((_a = templateNameList === null || templateNameList === void 0 ? void 0 : templateNameList[0]) === null || _a === void 0 ? void 0 : _a.id);
135
+ if (cloneTemplateName) {
136
+ if (value === saveExistValue) {
137
+ const selectedTemplate = templateNameList === null || templateNameList === void 0 ? void 0 : templateNameList.find(item => item.id === (templateName === null || templateName === void 0 ? void 0 : templateName.id));
138
+ // Check current template id is exist or not, if not then select first
139
+ if (cloneTemplateName) {
140
+ cloneTemplateName.id = (selectedTemplate === null || selectedTemplate === void 0 ? void 0 : selectedTemplate.id) || ((_a = templateNameList === null || templateNameList === void 0 ? void 0 : templateNameList[0]) === null || _a === void 0 ? void 0 : _a.id);
141
+ }
142
+ }
143
+ else {
144
+ const newDefaultTemplateName = `Untitled Template#${dayjs().format('YYYY-MM-DD HH:mm:ss')}`;
145
+ cloneTemplateName.label = newDefaultTemplateName;
146
+ }
120
147
  }
121
148
  handleChangeValue({ saveOption: e.target.value, templateName: cloneTemplateName });
122
149
  } },
@@ -140,8 +167,8 @@ export const TemplateSaveAs = props => {
140
167
  validator: validateName,
141
168
  },
142
169
  ] },
143
- React.createElement(Input, { placeholder: placeholder, maxLength: 255, debounce: 1000, onAfterChange: value => handleChangeValue({
144
- templateName: { id: undefined, label: value },
170
+ React.createElement(Input, { placeholder: placeholder, maxLength: 255, debounce: 500, onAfterChange: value => handleChangeValue({
171
+ templateName: { id: templateName === null || templateName === void 0 ? void 0 : templateName.id, label: value },
145
172
  }) }))) : (React.createElement(Form.Item, { name: "templateNameSelect" },
146
173
  React.createElement(Select
147
174
  // className="field-input"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@antscorp/antsomi-ui",
3
- "version": "1.3.5-beta.165",
3
+ "version": "1.3.5-beta.166",
4
4
  "description": "An enterprise-class UI design language and React UI library.",
5
5
  "sideEffects": [
6
6
  "dist/*",