@lvce-editor/settings-view 1.18.0 → 1.19.0

package/dist/settingsViewWorkerMain.js

@@ -1085,7 +1085,7 @@ const KeyCode = {
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
-const Button$1 = 1;
+const Button = 1;
 const Div = 4;
 const H1 = 5;
 const Input = 6;
@@ -1100,7 +1100,7 @@ const Label = 66;
 const VirtualDomElements = {
   __proto__: null,
   Aside,
-  Button: Button$1,
+  Button,
   Div,
   H1,
   H3,
@@ -1327,7 +1327,24 @@ const handleSettingChecked = (state, name, value, source = User) => {
   return handleSettingUpdate(state, name, value, source);
 };
 
+const Enum = 1;
+const String = 2;
+const Boolean$1 = 3;
+const Number$1 = 5;
+const Color = 6;
+const Url = 7;
+
 const handleSettingInput = (state, name, value, inputSource = User) => {
+  const {
+    items
+  } = state;
+
+  // TODO maybe have separate input functions for number and string inputs
+  const settingItem = items.find(item => item.id === name);
+  if (settingItem && settingItem.type === Number$1) {
+    const numberValue = value === '' ? '' : Number(value);
+    return handleSettingUpdate(state, name, numberValue, inputSource);
+  }
   return handleSettingUpdate(state, name, value, inputSource);
 };
 
@@ -1723,13 +1740,6 @@ const TextEditorTab = 'text-editor';
 const WindowTab = 'window';
 const WorkbenchTab = 'workbench';
 
-const Enum = 1;
-const String = 2;
-const Boolean$1 = 3;
-const Number$1 = 5;
-const Color = 6;
-const Url = 7;
-
 const emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
@@ -3931,11 +3941,8 @@ const {
   Viewlet
 } = ClassNames;
 const Badge = 'Badge';
-const Button = 'Button';
 const CheckBox = 'CheckBox';
-const Disabled = 'Disabled';
 const InputBox = 'InputBox';
-const InputButton = 'InputButton';
 const MaskIcon = 'MaskIcon';
 const MaskIconClearAll = 'MaskIconClearAll';
 const ModifiedIndicator = 'ModifiedIndicator';
@@ -3979,15 +3986,20 @@ const HandleScroll = 'handleScroll';
 const HandleSettingSelect = 'handleSettingSelect';
 const HandleInputFocus = 'handleInputFocus';
 
-const enabledClass = mergeClassNames(Button, InputButton, SearchFieldButton);
-const disabledClass = mergeClassNames(enabledClass, Disabled);
+const enabledClass = SearchFieldButton;
+const disabledClass = mergeClassNames(enabledClass, 'SearchFieldButtonDisabled');
 const getClearButtonClassName = hasSearchValue => {
   if (hasSearchValue) {
-    return disabledClass;
+    return enabledClass;
   }
-  return enabledClass;
+  return disabledClass;
 };
 
+const icon = {
+  type: VirtualDomElements.Div,
+  className: mergeClassNames(MaskIcon, MaskIconClearAll),
+  childCount: 0
+};
 const getSettingsInputButtonsDom = hasSearchValue => {
   return [{
     type: VirtualDomElements.Button,
@@ -3997,18 +4009,14 @@ const getSettingsInputButtonsDom = hasSearchValue => {
     name: Clear$1,
     disabled: !hasSearchValue,
     onClick: HandleClickClear
-  }, {
-    type: VirtualDomElements.Div,
-    className: mergeClassNames(MaskIcon, MaskIconClearAll),
-    childCount: 0
-  }];
+  }, icon];
 };
 
 const getSettingsInputDom = () => {
   const placeholder = searchSettings();
   return [{
     type: VirtualDomElements.Input,
-    className: mergeClassNames(InputBox, SettingsSearchInput),
+    className: mergeClassNames(InputBox, SettingsSearchInput, 'MultilineInputBox'),
     placeholder,
     childCount: 0,
     name: SettingsSearch,
@@ -4021,7 +4029,6 @@ const getChildCount = hasSearchValue => {
   return hasSearchValue ? 3 : 2;
 };
 const getSettingsHeaderDom = (filteredSettingsCount, hasSearchValue) => {
-  const badgeDom = getSettingsInputBadgeDom(filteredSettingsCount, hasSearchValue);
   const childCount = getChildCount(hasSearchValue);
   return [{
     type: VirtualDomElements.Div,
@@ -4029,9 +4036,9 @@ const getSettingsHeaderDom = (filteredSettingsCount, hasSearchValue) => {
     childCount: 1
   }, {
     type: VirtualDomElements.Div,
-    className: SettingsInputWrapper,
+    className: mergeClassNames(SettingsInputWrapper, 'SearchField'),
     childCount
-  }, ...getSettingsInputDom(), ...getSettingsInputButtonsDom(hasSearchValue), ...badgeDom];
+  }, ...getSettingsInputDom(), ...getSettingsInputBadgeDom(filteredSettingsCount, hasSearchValue), ...getSettingsInputButtonsDom(hasSearchValue)];
 };
 
 const getInputId = id => {
@@ -4398,13 +4405,17 @@ const enabledTypes = [Number$1, String, Color];
 const renderSettingValues = (oldState, newState) => {
   const {
     filteredItems,
-    id
+    id,
+    preferences
   } = newState;
-  const numericSettings = filteredItems.filter(item => enabledTypes.includes(item.type));
-  const inputValues = numericSettings.map(item => ({
-    name: item.id,
-    value: item.value
-  }));
+  const enabledSettings = filteredItems.filter(item => enabledTypes.includes(item.type));
+  const inputValues = enabledSettings.map(item => {
+    const value = preferences[item.id] || item.value;
+    return {
+      name: item.id,
+      value
+    };
+  });
   return ['Viewlet.setInputValues', id, inputValues];
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/settings-view",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",