@lvce-editor/settings-view 2.26.0 → 2.26.2

package/dist/settingsViewWorkerMain.js

@@ -1194,6 +1194,18 @@ const filterByTab = (items, tabs) => {
   return items.filter(item => item.category === selectedTab.id);
 };
 
+const parseFilterQuery = searchValue => {
+  const words = searchValue.split(/\s+/);
+  const modified = words.includes('@modified');
+  const query = words.filter(word => word !== '@modified').join(' ').trim();
+  return {
+    id: '',
+    language: '',
+    modified,
+    query
+  };
+};
+
 const isItemModified = (item, preferences) => {
   return item.id in preferences;
 };
@@ -1220,10 +1232,11 @@ const validateSettings = (items, modifiedSettings, preferences) => {
 };
 
 const getFilteredItems = (items, tabs, searchValue, modifiedSettings, preferences) => {
+  const parsedQuery = parseFilterQuery(searchValue);
   const tabFilteredItems = filterByTab(items, tabs);
-  const searchFilteredItems = filterBySearch(tabFilteredItems, searchValue);
+  const searchFilteredItems = filterBySearch(tabFilteredItems, parsedQuery.query);
   const validated = validateSettings(searchFilteredItems, modifiedSettings, preferences);
-  return validated;
+  return parsedQuery.modified ? validated.filter(item => item.modified) : validated;
 };
 
 const User = 1;
@@ -1376,6 +1389,159 @@ const diff2 = uid => {
   return diffResult;
 };
 
+const addToHistory = (history, value) => {
+  let newHistory = history;
+  let newHistoryIndex = -1;
+  if (!value || !value.trim()) {
+    return {
+      newHistory,
+      newHistoryIndex
+    };
+  }
+  const trimmedValue = value.trim();
+
+  // Check if this value is already in history
+  const existingIndex = history.indexOf(trimmedValue);
+  if (existingIndex !== -1) {
+    newHistoryIndex = existingIndex;
+    return {
+      newHistory,
+      newHistoryIndex
+    };
+  }
+
+  // Check if this value is a prefix of any existing history item
+  // If it is, don't add it to history yet (it's still being typed)
+  const isPrefixOfExisting = history.some(historyItem => historyItem.startsWith(trimmedValue) && historyItem !== trimmedValue);
+  if (isPrefixOfExisting) {
+    // Don't add to history, but find the closest match for index
+    const closestMatch = history.find(historyItem => historyItem.startsWith(trimmedValue));
+    if (closestMatch) {
+      newHistoryIndex = history.indexOf(closestMatch);
+    }
+    return {
+      newHistory,
+      newHistoryIndex
+    };
+  }
+
+  // Check if any existing history items are prefixes of this value
+  // If so, remove all prefix items and add the complete value at the first prefix position
+  const prefixItems = history.filter(historyItem => trimmedValue.startsWith(historyItem) && historyItem !== trimmedValue);
+  if (prefixItems.length > 0) {
+    // Find the position of the first prefix item
+    const firstPrefixIndex = history.findIndex(historyItem => trimmedValue.startsWith(historyItem) && historyItem !== trimmedValue);
+
+    // Remove all prefix items and add the complete value at the first prefix position
+
+    // Insert the new value at the position where the first prefix was
+    const beforePrefix = history.slice(0, firstPrefixIndex);
+    const afterPrefix = history.slice(firstPrefixIndex).filter(historyItem => !trimmedValue.startsWith(historyItem) || historyItem === trimmedValue);
+    newHistory = [...beforePrefix, trimmedValue, ...afterPrefix];
+    newHistoryIndex = firstPrefixIndex;
+  } else {
+    // Add as new item
+    newHistory = [...history, trimmedValue];
+    newHistoryIndex = newHistory.length - 1;
+  }
+  return {
+    newHistory,
+    newHistoryIndex
+  };
+};
+
+const handleInput = (state, value, inputSource = User) => {
+  const {
+    height,
+    history,
+    itemHeight,
+    items,
+    modifiedSettings,
+    preferences,
+    tabs
+  } = state;
+  const filteredItems = getFilteredItems(items, tabs, value, modifiedSettings, preferences);
+  // Reset scroll when filter value changes so the user sees results from the top
+  const nextScrollOffset = 0;
+  const {
+    maxLineY,
+    minLineY,
+    visibleItems
+  } = computeVisibleItems(filteredItems, height, nextScrollOffset, itemHeight);
+  const {
+    scrollBarMinHeight
+  } = state;
+  const {
+    thumbHeight,
+    thumbTop
+  } = computeScrollBar(height, filteredItems.length, itemHeight, nextScrollOffset, scrollBarMinHeight);
+  const {
+    newHistory,
+    newHistoryIndex
+  } = addToHistory(history, value);
+  return {
+    ...state,
+    deltaY: 0,
+    filteredItems,
+    history: newHistory,
+    historyIndex: newHistoryIndex,
+    inputSource,
+    maxLineY,
+    minLineY,
+    scrollBarThumbHeight: thumbHeight,
+    scrollBarThumbTop: thumbTop,
+    scrollOffset: nextScrollOffset,
+    searchValue: value,
+    visibleItems
+  };
+};
+
+const applyFilter = (state, searchValue) => {
+  const newState = handleInput(state, searchValue, Script);
+  return {
+    ...newState,
+    focus: FocusSettingsInput,
+    focusSource: Script
+  };
+};
+const appendFilter = (state, filter) => {
+  const {
+    searchValue: currentSearchValue
+  } = state;
+  const searchValue = currentSearchValue.trimEnd();
+  const newSearchValue = searchValue ? `${searchValue} ${filter}` : filter;
+  return applyFilter(state, newSearchValue);
+};
+const toggleFilter = (state, filter) => {
+  const {
+    searchValue
+  } = state;
+  const words = searchValue.split(' ');
+  const newSearchValue = words.includes(filter) ? words.filter(word => word !== filter).join(' ') : [...words.filter(Boolean), filter].join(' ');
+  return applyFilter(state, newSearchValue);
+};
+const toggleExclusiveFilter = (state, filter, excludedFilters) => {
+  const {
+    searchValue
+  } = state;
+  const words = searchValue.split(' ');
+  if (words.includes(filter)) {
+    return applyFilter(state, words.filter(word => word !== filter).join(' '));
+  }
+  const newSearchValue = [...words.filter(word => word && word !== filter && !excludedFilters.includes(word)), filter].join(' ');
+  return applyFilter(state, newSearchValue);
+};
+const filterAdvanced = state => toggleFilter(state, '@tag:advanced');
+const filterExperimental = state => toggleExclusiveFilter(state, '@tag:experimental', ['@stable', '@tag:preview']);
+const filterExtensionId = state => appendFilter(state, '@ext:');
+const filterFeature = state => appendFilter(state, '@feature:');
+const filterLanguage = state => appendFilter(state, '@lang:');
+const filterModified = state => toggleFilter(state, '@modified');
+const filterPreview = state => toggleExclusiveFilter(state, '@tag:preview', ['@stable', '@tag:experimental']);
+const filterSettingId = state => appendFilter(state, '@id:');
+const filterStable = state => toggleExclusiveFilter(state, '@stable', ['@tag:preview', '@tag:experimental']);
+const filterTag = state => appendFilter(state, '@tag:');
+
 const Group = 'group';
 const Tab$1 = 'tab';
 const TabList = 'tablist';
@@ -1873,9 +2039,11 @@ const TargetValue = 'event.target.value';
 const UpArrow = 14;
 const DownArrow = 16;
 
+const Settings$1 = 12;
 const SettingsFilter = 94;
 
 const None$1 = 0;
+const Disabled = 5;
 
 const SetCss = 'Viewlet.setCss';
 
@@ -1927,6 +2095,7 @@ const Modified = 'Modified';
 const NoSettingsMatching = 'No settings matching "{PH1}" found';
 const NumberValue = 'number value';
 const Preview = 'Preview';
+const ResetSetting = 'Reset Setting';
 const SearchSettings = 'Search Settings';
 const SettingId = 'Setting Id';
 const SettingsContent$1 = 'Settings Content';
@@ -1956,6 +2125,7 @@ const noSettingsMatching = searchTerm => {
 };
 const numberValue = () => i18nString(NumberValue);
 const preview = () => i18nString(Preview);
+const resetSetting$1 = () => i18nString(ResetSetting);
 const searchSettings = () => i18nString(SearchSettings);
 const settingId = () => i18nString(SettingId);
 const settingsContent = () => i18nString(SettingsContent$1);
@@ -1966,60 +2136,77 @@ const unknownSettingType = () => i18nString(UnknownSettingType);
 
 const getMenuEntries = () => {
   return [{
-    command: 'Settings.filter.advanced',
+    command: 'Settings.filterAdvanced',
     flags: None$1,
     id: 'filter-advanced',
     label: advanced()
   }, {
-    command: 'Settings.filter.experimental',
+    command: 'Settings.filterExperimental',
     flags: None$1,
     id: 'filter-experimental',
     label: experimental()
   }, {
-    command: 'Settings.filter.extensionId',
+    command: 'Settings.filterExtensionId',
     flags: None$1,
     id: 'filter-extensionId',
     label: extensionId()
   }, {
-    command: 'Settings.filter.feature',
+    command: 'Settings.filterFeature',
     flags: None$1,
     id: 'filter-feature',
     label: feature()
   }, {
-    command: 'Settings.filter.language',
+    command: 'Settings.filterLanguage',
     flags: None$1,
     id: 'filter-language',
     label: language()
   }, {
-    command: 'Settings.filter.modified',
+    command: 'Settings.filterModified',
     flags: None$1,
     id: 'filter-modified',
     label: modified()
   }, {
-    command: 'Settings.filter.preview',
+    command: 'Settings.filterPreview',
     flags: None$1,
     id: 'filter-preview',
     label: preview()
   }, {
-    command: 'Settings.filter.settingId',
+    command: 'Settings.filterSettingId',
     flags: None$1,
     id: 'filter-settingId',
     label: settingId()
   }, {
-    command: 'Settings.filter.stable',
+    command: 'Settings.filterStable',
     flags: None$1,
     id: 'filter-stable',
     label: stable()
   }, {
-    command: 'Settings.filter.tag',
+    command: 'Settings.filterTag',
     flags: None$1,
     id: 'filter-tag',
     label: tag()
   }];
 };
 
+const getMenuEntries2 = (state, props) => {
+  if (props.menuId === SettingsFilter) {
+    return getMenuEntries();
+  }
+  const {
+    modifiedSettings
+  } = state;
+  const modified = props.settingId in modifiedSettings;
+  return [{
+    args: [props.settingId],
+    command: 'Settings.resetSetting',
+    flags: modified ? None$1 : Disabled,
+    id: 'resetSetting',
+    label: resetSetting$1()
+  }];
+};
+
 const getMenuIds = () => {
-  return [SettingsFilter];
+  return [SettingsFilter, Settings$1];
 };
 
 const getName = () => {
@@ -2132,11 +2319,29 @@ const show2 = async (uid, menuId, x, y, args) => {
   await showContextMenu2(uid, menuId, x, y, args);
 };
 
-const handleClickFilterButton = async (state, x, y) => {
+const filterButtonWidth = 20;
+const searchFieldHeight = 26;
+const settingsHeaderPaddingRight = 24;
+const settingsHeaderPaddingTop = 14;
+const getMenuPosition = (state, eventX, eventY) => {
+  if (eventX !== 0 || eventY !== 0) {
+    return [eventX, eventY];
+  }
+  const {
+    width,
+    x,
+    y
+  } = state;
+  const menuX = x + width - settingsHeaderPaddingRight - filterButtonWidth / 2;
+  const menuY = y + settingsHeaderPaddingTop + searchFieldHeight / 2;
+  return [menuX, menuY];
+};
+const handleClickFilterButton = async (state, eventX, eventY) => {
   const {
     id
   } = state;
-  await show2(id, SettingsFilter, x, y, {
+  const [menuX, menuY] = getMenuPosition(state, eventX, eventY);
+  await show2(id, SettingsFilter, menuX, menuY, {
     menuId: SettingsFilter
   });
   return state;
@@ -2203,111 +2408,19 @@ const handleClickTab = (state, name) => {
   };
 };
 
-const addToHistory = (history, value) => {
-  let newHistory = history;
-  let newHistoryIndex = -1;
-  if (!value || !value.trim()) {
-    return {
-      newHistory,
-      newHistoryIndex
-    };
-  }
-  const trimmedValue = value.trim();
-
-  // Check if this value is already in history
-  const existingIndex = history.indexOf(trimmedValue);
-  if (existingIndex !== -1) {
-    newHistoryIndex = existingIndex;
-    return {
-      newHistory,
-      newHistoryIndex
-    };
-  }
-
-  // Check if this value is a prefix of any existing history item
-  // If it is, don't add it to history yet (it's still being typed)
-  const isPrefixOfExisting = history.some(historyItem => historyItem.startsWith(trimmedValue) && historyItem !== trimmedValue);
-  if (isPrefixOfExisting) {
-    // Don't add to history, but find the closest match for index
-    const closestMatch = history.find(historyItem => historyItem.startsWith(trimmedValue));
-    if (closestMatch) {
-      newHistoryIndex = history.indexOf(closestMatch);
-    }
-    return {
-      newHistory,
-      newHistoryIndex
-    };
-  }
-
-  // Check if any existing history items are prefixes of this value
-  // If so, remove all prefix items and add the complete value at the first prefix position
-  const prefixItems = history.filter(historyItem => trimmedValue.startsWith(historyItem) && historyItem !== trimmedValue);
-  if (prefixItems.length > 0) {
-    // Find the position of the first prefix item
-    const firstPrefixIndex = history.findIndex(historyItem => trimmedValue.startsWith(historyItem) && historyItem !== trimmedValue);
-
-    // Remove all prefix items and add the complete value at the first prefix position
-
-    // Insert the new value at the position where the first prefix was
-    const beforePrefix = history.slice(0, firstPrefixIndex);
-    const afterPrefix = history.slice(firstPrefixIndex).filter(historyItem => !trimmedValue.startsWith(historyItem) || historyItem === trimmedValue);
-    newHistory = [...beforePrefix, trimmedValue, ...afterPrefix];
-    newHistoryIndex = firstPrefixIndex;
-  } else {
-    // Add as new item
-    newHistory = [...history, trimmedValue];
-    newHistoryIndex = newHistory.length - 1;
-  }
-  return {
-    newHistory,
-    newHistoryIndex
-  };
-};
-
-const handleInput = (state, value, inputSource = User) => {
-  const {
-    height,
-    history,
-    itemHeight,
-    items,
-    modifiedSettings,
-    preferences,
-    tabs
-  } = state;
-  const filteredItems = getFilteredItems(items, tabs, value, modifiedSettings, preferences);
-  // Reset scroll when filter value changes so the user sees results from the top
-  const nextScrollOffset = 0;
+const handleContextMenu = async (state, settingId, x, y) => {
   const {
-    maxLineY,
-    minLineY,
-    visibleItems
-  } = computeVisibleItems(filteredItems, height, nextScrollOffset, itemHeight);
-  const {
-    scrollBarMinHeight
+    id,
+    items
   } = state;
-  const {
-    thumbHeight,
-    thumbTop
-  } = computeScrollBar(height, filteredItems.length, itemHeight, nextScrollOffset, scrollBarMinHeight);
-  const {
-    newHistory,
-    newHistoryIndex
-  } = addToHistory(history, value);
-  return {
-    ...state,
-    deltaY: 0,
-    filteredItems,
-    history: newHistory,
-    historyIndex: newHistoryIndex,
-    inputSource,
-    maxLineY,
-    minLineY,
-    scrollBarThumbHeight: thumbHeight,
-    scrollBarThumbTop: thumbTop,
-    scrollOffset: nextScrollOffset,
-    searchValue: value,
-    visibleItems
-  };
+  if (items.every(item => item.id !== settingId)) {
+    return state;
+  }
+  await show2(id, Settings$1, x, y, {
+    menuId: Settings$1,
+    settingId
+  });
+  return state;
 };
 
 const None = 0;
@@ -2428,6 +2541,7 @@ const handleSettingUpdate = (state, name, value, inputSource) => {
     ...state,
     filteredItems: newFilteredItems,
     inputSource,
+    modifiedSettings: newModifiedSettings,
     preferences: newPreferences
   };
 };
@@ -2672,8 +2786,7 @@ const loadContent = async (state, savedState) => {
   } = restoreState(savedState);
   const tabs = await getTabs();
   const newTabs = getUpdatedTabs(tabs, tabId);
-  const items = await getSettingItems();
-  const preferences = await getPreferences();
+  const [items, preferences] = await Promise.all([getSettingItems(), getPreferences()]);
   const modifiedSettings = getModifiedSettings(preferences);
   const filteredItems = getFilteredItems(items, newTabs, searchValue, modifiedSettings, preferences);
   const {
@@ -2811,6 +2924,7 @@ const getSettingsInputBadgeDom = (filteredSettingsCount, hasSearchValue) => {
 const HandleClickClear = 'handleClickClear';
 const HandleClickFilterButton = 'handleClickFilterButton';
 const HandleClickTab = 'handleClickTab';
+const HandleContextMenu = 'handleContextMenu';
 const HandleInput = 'handleInput';
 const HandleSettingInput = 'handleSettingInput';
 const HandleSettingChecked = 'handleSettingChecked';
@@ -2998,6 +3112,7 @@ const getItemCheckBoxVirtualDom = item => {
     childCount: 2 + errorChildCount,
     className: SettingsItem,
     'data-modified': modified,
+    name: id,
     role: Group,
     type: Div
   }, ...getItemHeadingDom(heading), checkBoxWrapperNode, {
@@ -3032,6 +3147,7 @@ const getItemColorVirtualDom = item => {
     childCount: 3 + errorChildCount,
     className: SettingsItem,
     'data-modified': modified,
+    name: id,
     role: Group,
     type: Div
   }, ...getItemHeadingDom(heading), colorInputWrapperNode, {
@@ -3086,6 +3202,7 @@ const getItemNumberVirtualDom = item => {
     childCount,
     className: SettingsItem,
     'data-modified': modified,
+    name: id,
     role: Group,
     type: Div
   }, ...getSettingsModifiedIndicatorDom(modified), ...getItemHeadingDom(heading), ...getItemLabelDom(domId, description), {
@@ -3127,6 +3244,7 @@ const getItemSelectVirtualDom = item => {
   return [{
     childCount: 3 + errorChildCount,
     className: SettingsItem,
+    name: id,
     role: Group,
     type: Div
   }, ...getItemHeadingDom(heading), ...getItemLabelDom(domId, description), {
@@ -3153,6 +3271,7 @@ const getItemStringVirtualDom = item => {
   return [{
     childCount: 3 + errorChildCount,
     className: SettingsItem,
+    name: id,
     role: Group,
     type: Div
   }, ...getItemHeadingDom(heading), ...getItemLabelDom(domId, description), {
@@ -3167,14 +3286,14 @@ const getItemStringVirtualDom = item => {
   }, ...getErrorMessageDom(errorMessage)];
 };
 
-const unknownItemNode = {
-  childCount: 1,
-  className: SettingsItem,
-  role: Group,
-  type: Div
-};
-const getItemUnknownVirtualDom = () => {
-  return [unknownItemNode, text(unknownSettingType())];
+const getItemUnknownVirtualDom = item => {
+  return [{
+    childCount: 1,
+    className: SettingsItem,
+    name: item.id,
+    role: Group,
+    type: Div
+  }, text(unknownSettingType())];
 };
 
 const getItemUrlVirtualDom = item => {
@@ -3193,6 +3312,7 @@ const getItemUrlVirtualDom = item => {
     childCount: 3 + errorChildCount,
     className: SettingsItem,
     'data-modified': modified,
+    name: id,
     role: Group,
     type: Div
   }, ...getItemHeadingDom(heading), ...getItemLabelDom(domId, description), {
@@ -3234,6 +3354,7 @@ const getItemVirtualDom = item => {
 const settingsItemsNode = {
   childCount: 1,
   className: SettingsItems,
+  onContextMenu: HandleContextMenu,
   type: Div
 };
 const noResultsNode = {
@@ -3252,6 +3373,7 @@ const getSettingsItemsDom = (items, searchValue) => {
   return [{
     childCount: items.length,
     className: SettingsItems,
+    onContextMenu: HandleContextMenu,
     type: Div
   }, ...items.flatMap(getItemVirtualDom)];
 };
@@ -3353,7 +3475,7 @@ const renderSettingValues = (oldState, newState) => {
   } = newState;
   const enabledSettings = filteredItems.filter(item => enabledTypes.includes(item.type));
   const inputValues = enabledSettings.map(item => {
-    const value = preferences[item.id] || item.value;
+    const value = preferences[item.id] ?? item.value;
     return {
       name: item.id,
       value
@@ -3432,6 +3554,10 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickFilterButton,
     params: ['handleClickFilterButton', ClientX, ClientY]
+  }, {
+    name: HandleContextMenu,
+    params: ['handleContextMenu', TargetName, ClientX, ClientY],
+    preventDefault: true
   }, {
     name: HandleSettingInput,
     params: ['handleSettingInput', TargetName, TargetValue]
@@ -3467,6 +3593,30 @@ const renderEventListeners = () => {
   }];
 };
 
+const resetSetting = (state, settingId) => {
+  const {
+    filteredItems,
+    items,
+    modifiedSettings,
+    preferences,
+    searchValue,
+    tabs
+  } = state;
+  if (!(settingId in modifiedSettings)) {
+    return state;
+  }
+  const newModifiedSettings = Object.fromEntries(Object.entries(modifiedSettings).filter(([key]) => key !== settingId));
+  const newPreferences = Object.fromEntries(Object.entries(preferences).filter(([key]) => key !== settingId));
+  const newFilteredItems = getNewFilteredItems(modifiedSettings, newModifiedSettings, items, tabs, searchValue, filteredItems, preferences, newPreferences);
+  return {
+    ...state,
+    filteredItems: newFilteredItems,
+    inputSource: Script,
+    modifiedSettings: newModifiedSettings,
+    preferences: newPreferences
+  };
+};
+
 const saveState = state => {
   const {
     focus,
@@ -3547,13 +3697,24 @@ const commandMap = {
   'Settings.clearHistory': wrapCommand(clearHistory),
   'Settings.create': create$1,
   'Settings.diff2': diff2,
+  'Settings.filterAdvanced': wrapCommand(filterAdvanced),
+  'Settings.filterExperimental': wrapCommand(filterExperimental),
+  'Settings.filterExtensionId': wrapCommand(filterExtensionId),
+  'Settings.filterFeature': wrapCommand(filterFeature),
+  'Settings.filterLanguage': wrapCommand(filterLanguage),
+  'Settings.filterModified': wrapCommand(filterModified),
+  'Settings.filterPreview': wrapCommand(filterPreview),
+  'Settings.filterSettingId': wrapCommand(filterSettingId),
+  'Settings.filterStable': wrapCommand(filterStable),
+  'Settings.filterTag': wrapCommand(filterTag),
   'Settings.getCommandIds': getCommandIds,
   'Settings.getKeyBindings': getKeyBindings,
-  'Settings.getMenuEntries': getMenuEntries,
+  'Settings.getMenuEntries': wrapGetter(getMenuEntries2),
   'Settings.getMenuIds': getMenuIds,
   'Settings.getName': getName,
   'Settings.handleClickFilterButton': wrapCommand(handleClickFilterButton),
   'Settings.handleClickTab': wrapCommand(handleClickTab),
+  'Settings.handleContextMenu': wrapCommand(handleContextMenu),
   'Settings.handleInput': wrapCommand(handleInput),
   'Settings.handleInputBlur': wrapCommand(handleInputBlur),
   'Settings.handleInputFocus': wrapCommand(handleInputFocus),
@@ -3570,6 +3731,7 @@ const commandMap = {
   'Settings.render2': render2,
   'Settings.renderActions': renderActions,
   'Settings.renderEventListeners': renderEventListeners,
+  'Settings.resetSetting': wrapCommand(resetSetting),
   'Settings.restoreState': restoreState,
   'Settings.saveState': wrapGetter(saveState),
   'Settings.terminate': terminate,

package/package.json

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