@lvce-editor/static-server 0.66.10 → 0.66.11

package/static/{c3a0ed8 → 4c41bed}/packages/renderer-process/dist/rendererProcessMain.js

@@ -508,11 +508,12 @@ const getOptions = fn => {
   return undefined;
 };
 const attachEvent$1 = ($Node, eventMap, key, value, newEventMap) => {
+  const keyLower = key.toLowerCase();
   if (newEventMap && newEventMap[value]) {
     const fn = newEventMap[value];
     const options = getOptions(fn);
     // TODO support event listener options
-    $Node.addEventListener(key, newEventMap[value], options);
+    $Node.addEventListener(keyLower, newEventMap[value], options);
     return;
   }
   const listener = eventMap[value];
@@ -522,7 +523,7 @@ const attachEvent$1 = ($Node, eventMap, key, value, newEventMap) => {
   }
   const options = getEventListenerOptions$1(key, value);
   const wrapped = getWrappedListener$1(listener, eventMap.returnValue);
-  $Node.addEventListener(key, wrapped, options);
+  $Node.addEventListener(keyLower, wrapped, options);
 };
 const setProp = ($Element, key, value, eventMap, newEventMap) => {
   switch (key) {
@@ -604,6 +605,7 @@ const setProp = ($Element, key, value, eventMap, newEventMap) => {
     case 'onPointerOut':
     case 'onPointerOver':
     case 'onScroll':
+    case 'onSelectionChange':
     case 'onWheel':
       const eventName = key.slice(2).toLowerCase();
       if (!eventMap || !value) {
@@ -858,6 +860,10 @@ const getEventListenerArg = (param, event) => {
       return event.target.dataset.index;
     case 'event.target.nodeName':
       return event.target.nodeName;
+    case 'event.target.selectionStart':
+      return event.target.selectionStart;
+    case 'event.target.selectionEnd':
+      return event.target.selectionEnd;
     default:
       return param;
   }
@@ -2624,7 +2630,7 @@ const getAssetDir = () => {
   }
   return '';
 };
-const assetDir = '/c3a0ed8';
+const assetDir = '/4c41bed';
 
 const getConfiguredWorkerUrl = key => {
   if (typeof location === 'undefined' || typeof document === 'undefined') {

package/static/{c3a0ed8 → 4c41bed}/packages/renderer-process/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "19.2.0",
+  "version": "19.3.0",
   "keywords": [
     "lvce-editor",
     "renderer-process"

package/static/{c3a0ed8 → 4c41bed}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -96,7 +96,7 @@ const getAssetDir = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/c3a0ed8';
+    return '/4c41bed';
   }
 };
 const assetDir = getAssetDir();
@@ -19082,17 +19082,20 @@ const create$l = id => {
     statusBarVisible: false,
     titleBarVisible: false,
     workbenchVisible: false,
+    sideBarView: '',
     updateState: 'none',
     updateProgress: 0
   };
 };
 const saveState$b = state => {
   const {
-    points
+    points,
+    sideBarView
   } = state;
   const pointsArray = [...points];
   return {
-    points: pointsArray
+    points: pointsArray,
+    sideBarView
   };
 };
 const getSideBarLocationType = () => {
@@ -19118,6 +19121,12 @@ const getSavedPoints = savedState => {
 const isNativeTitleBarStyle = () => {
   return platform === Electron$1 && get$e('window.titleBarStyle') === 'native';
 };
+const getSavedSideBarView = savedState => {
+  if (savedState && savedState.sideBarView && typeof savedState.sideBarView === 'string') {
+    return savedState.sideBarView;
+  }
+  return Explorer$1;
+};
 const loadContent$m = (state, savedState) => {
   const {
     Layout
@@ -19131,6 +19140,7 @@ const loadContent$m = (state, savedState) => {
   } = bounds;
   const sideBarLocation = getSideBarLocationType();
   const newPoints = getSavedPoints(savedState);
+  const savedView = getSavedSideBarView(savedState);
   newPoints[ActivityBarVisible] = 1;
   newPoints[ActivityBarWidth] = 48;
   newPoints[MainVisible] = 1;
@@ -19167,7 +19177,8 @@ const loadContent$m = (state, savedState) => {
     sideBarSashVisible: true,
     panelSashVisible: true,
     mainContentsVisible: true,
-    workbenchVisible: true
+    workbenchVisible: true,
+    sideBarView: savedView
   };
 };
 const show$4 = async (state, module, currentViewletId) => {

package/static/{c3a0ed8 → 4c41bed}/packages/text-search-worker/dist/textSearchWorkerMain.js

@@ -1223,9 +1223,12 @@ const ClientY = 'event.clientY';
 const DeltaMode = 'event.deltaMode';
 const DeltaY = 'event.deltaY';
 const TargetName = 'event.target.name';
+const TargetSelectionEnd = 'event.target.selectionEnd';
+const TargetSelectionStart = 'event.target.selectionStart';
 const TargetValue = 'event.target.value';
 
 const Search$1 = 18;
+const InputContextMenu = 91;
 
 const None$1 = 0;
 
@@ -1731,7 +1734,7 @@ const collapseDetails = state => {
   };
 };
 
-const copy = async state => {
+const copy$1 = async state => {
   const {
     items,
     focusedIndex
@@ -1847,7 +1850,25 @@ const create = (uid, x, y, width, height, workspacePath, assetDir, itemHeight, v
     limit: 20_000,
     fileIconCache: {},
     removeButtonWidth: 20,
-    removeButtonRight: 0
+    removeButtonRight: 0,
+    selections: {
+      SearchValue: {
+        start: 0,
+        end: 0
+      },
+      ReplaceValue: {
+        start: 0,
+        end: 0
+      },
+      FilesToExclude: {
+        start: 0,
+        end: 0
+      },
+      FilesToInclude: {
+        start: 0,
+        end: 0
+      }
+    }
   };
   set(uid, state, state);
   return state;
@@ -1860,6 +1881,7 @@ const RenderReplaceValue = 4;
 const RenderIncludeValue = 5;
 const RenderExcludeValue = 6;
 const RenderFocusContext = 7;
+const RenderSelections = 8;
 
 const diffType$5 = RenderExcludeValue;
 const isEqual$6 = (oldState, newState) => {
@@ -2156,6 +2178,10 @@ const ConfirmReplaceOneOccurrenceInOneFile = "Replace 1 occurrence across 1 file
 const ConfirmReplaceOneOccurrenceInOneFileNoValue = 'Replace 1 occurrence across 1 file';
 const CopyPath = 'Copy Path';
 const Dismiss = 'Dismiss';
+const Cut = 'Cut';
+const Copy = 'Copy';
+const Paste = 'Paste';
+const SelectAll = 'SelectAll';
 const Exclude = 'Exclude';
 const FilesToExclude$1 = 'Files to Exclude';
 const FilesToInclude$1 = 'Files to Include';
@@ -2282,6 +2308,18 @@ const replace = () => {
 const dismiss = () => {
   return i18nString(Dismiss);
 };
+const cut = () => {
+  return i18nString(Cut);
+};
+const copy = () => {
+  return i18nString(Copy);
+};
+const paste = () => {
+  return i18nString(Paste);
+};
+const selectAll = () => {
+  return i18nString(SelectAll);
+};
 const theResultSetOnlyContainsASubSetOfMatches = () => {
   return i18nString(TheResultSetOnlyContainsASubSetOfMatches);
 };
@@ -2635,7 +2673,41 @@ const getKeyBindings = () => {
   return [...getSearchHeaderKeyBindings(), ...getSearchResultKeyBindings()];
 };
 
-const getMenuEntries = () => {
+const getMenuEntriesInput = options => {
+  const {
+    inputName
+  } = options;
+  if (!inputName) {
+    return [];
+  }
+  return [{
+    id: 'cut',
+    label: cut(),
+    flags: None$1,
+    command: 'Search.handleInputCut',
+    args: [inputName]
+  }, {
+    id: 'copy',
+    label: copy(),
+    flags: None$1,
+    command: 'Search.handleInputCopy',
+    args: [inputName]
+  }, {
+    id: 'paste',
+    label: paste(),
+    flags: None$1,
+    command: 'Search.handleInputPaste',
+    args: [inputName]
+  }, {
+    id: 'selectAll',
+    label: selectAll(),
+    flags: None$1,
+    command: 'Search.handleInputSelectAll',
+    args: [inputName]
+  }];
+};
+
+const getMenuEntriesList = () => {
   return [{
     id: 'dismiss',
     label: dismiss(),
@@ -2649,8 +2721,18 @@ const getMenuEntries = () => {
   }];
 };
 
+const getMenuEntries = (state, props) => {
+  if (props.menuId === Search$1) {
+    return getMenuEntriesList();
+  }
+  if (props.menuId === InputContextMenu) {
+    return getMenuEntriesInput(props);
+  }
+  return [];
+};
+
 const getMenuEntryIds = () => {
-  return [Search$1];
+  return [Search$1, InputContextMenu];
 };
 
 const handleError = error => {
@@ -3307,6 +3389,99 @@ const handleInputBlur = async (state, name) => {
   return state;
 };
 
+const show2 = async (uid, menuId, x, y, args) => {
+  await showContextMenu2(uid, menuId, x, y, args);
+};
+
+const handleInputContextMenu = async (state, name, button, x, y) => {
+  const {
+    uid
+  } = state;
+  await show2(uid, InputContextMenu, x, y, {
+    menuId: InputContextMenu,
+    inputName: name
+  });
+  return state;
+};
+
+const handleInputCopy = async (state, name) => {
+  // TODO write selected text to clipboard
+  return state;
+};
+
+const getNewText = (currentText, selectionStart, selectionEnd, insertedText) => {
+  const pre = currentText.slice(0, selectionStart);
+  const post = currentText.slice(selectionEnd);
+  const merged = pre + insertedText + post;
+  return merged;
+};
+
+const readText = async () => {
+  return await invoke$1('ClipBoard.readText');
+};
+
+const isSelectionKey = (name, selections) => {
+  return name in selections;
+};
+const getCurrentValue = (state, name) => {
+  switch (name) {
+    case SearchValue:
+      return state.value;
+    case FilesToExclude:
+      return state.excludeValue;
+    case FilesToInclude:
+      return state.includeValue;
+    case ReplaceValue:
+      return state.replacement;
+    default:
+      return '';
+  }
+};
+const handleInputPaste = async (state, name) => {
+  const {
+    selections
+  } = state;
+  if (!isSelectionKey(name, selections)) {
+    return state;
+  }
+  const selection = selections[name];
+  const {
+    start,
+    end
+  } = selection;
+  const currentText = getCurrentValue(state, name);
+  const insertedText = await readText();
+  const newText = getNewText(currentText, start, end, insertedText);
+  if (newText) {
+    return state;
+  }
+  // TODO paste text
+  return state;
+};
+
+const handleInputCut = async (state, name) => {
+  const {
+    selections
+  } = state;
+  if (!isSelectionKey(name, selections)) {
+    return state;
+  }
+  const selection = selections[name];
+  const {
+    start,
+    end
+  } = selection;
+  const currentText = getCurrentValue(state, name);
+  const insertedText = '';
+  // TODO get cut text
+  const newText = getNewText(currentText, start, end, insertedText);
+  if (newText) {
+    return state;
+  }
+  // TODO cut text
+  return state;
+};
+
 const getSearchFocusKey = key => {
   switch (key) {
     case SearchValue:
@@ -3350,6 +3525,22 @@ const handleInputFocus = (state, name) => {
   };
 };
 
+const handleInputSelectionChange = async (state, name, selectionStart, selectionEnd) => {
+  const {
+    selections
+  } = state;
+  return {
+    ...state,
+    selections: {
+      ...selections,
+      [name]: {
+        selectionStart,
+        selectionEnd
+      }
+    }
+  };
+};
+
 const handleListBlur = state => {
   return {
     ...state,
@@ -3469,6 +3660,7 @@ const focusIndexScrollDown = (state, index, listHeight, itemHeight, itemsLength)
   return {
     ...state,
     focusedIndex: index,
+    listFocusedIndex: index,
     minLineY: newMinLineY,
     maxLineY: newMaxLineY,
     focused: true,
@@ -3491,6 +3683,7 @@ const focusIndexScrollUp = (state, index, listHeight, itemHeight, itemsLength) =
   return {
     ...state,
     focusedIndex: index,
+    listFocusedIndex: index,
     minLineY: newMinLineY,
     maxLineY: newMaxLineY,
     focused: true,
@@ -3516,6 +3709,7 @@ const focusIndex = (state, index) => {
     return {
       ...state,
       focusedIndex: -1,
+      listFocusedIndex: -1,
       focused: true
     };
   }
@@ -3529,6 +3723,7 @@ const focusIndex = (state, index) => {
   return {
     ...state,
     focusedIndex: index,
+    listFocusedIndex: index,
     focused: true
   };
 };
@@ -4270,6 +4465,8 @@ const HandleWheel = 16;
 const HandleInputFocus = 17;
 const HandleInputBlur = 18;
 const HandleListPointerDown = 19;
+const HandleInputContextMenu = 20;
+const HandleInputSelectionChange = 21;
 
 const getSearchDetailsToggleVirtualDom = () => {
   return [{
@@ -4449,7 +4646,8 @@ const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, out
     onInput,
     onFocus: HandleInputFocus,
     onBlur: HandleInputBlur,
-    onContextMenu: HandleListContextMenu,
+    onContextMenu: HandleInputContextMenu,
+    onSelectionChange: HandleInputSelectionChange,
     childCount: 0
   }, {
     type: Div,
@@ -4887,6 +5085,13 @@ const renderItems = (oldState, newState) => {
   return [SetDom2, newState.uid, dom];
 };
 
+const renderSelections = (oldState, newState) => {
+  // const { selections, uid } = newState
+
+  // TODO
+  return [];
+};
+
 const renderValue = (oldState, newState) => {
   return [SetValueByName, SearchValue, newState.value];
 };
@@ -4916,6 +5121,8 @@ const getRenderer = diffType => {
       return renderItems;
     case RenderFocusContext:
       return renderFocusContext;
+    case RenderSelections:
+      return renderSelections;
     default:
       throw new Error('unknown renderer');
   }
@@ -5057,6 +5264,13 @@ const renderEventListeners = () => {
     name: HandleListContextMenu,
     params: ['handleContextMenu', Button$1, ClientX, ClientY],
     preventDefault: true
+  }, {
+    name: HandleInputContextMenu,
+    params: ['handleInputContextMenu', TargetName, Button$1, ClientX, ClientY],
+    preventDefault: true
+  }, {
+    name: HandleInputSelectionChange,
+    params: ['handleInputSelectionChange', TargetName, TargetSelectionStart, TargetSelectionEnd]
   }, {
     name: HandleHeaderContextMenu,
     params: ['handleHeaderContextMenu'],
@@ -5269,10 +5483,6 @@ const viewAsTree = async state => {
 
 const Keyboard = -1;
 
-const show2 = async (uid, menuId, x, y, args) => {
-  await showContextMenu2(uid, menuId, x, y, args);
-};
-
 const handleContextMenuKeyboard = async state => {
   const {
     x,
@@ -5314,7 +5524,7 @@ const commandMap = {
   'TextSearch.clearSearchResults': wrapCommand(clearSearchResults$1),
   'TextSearch.collapseAll': wrapCommand(collapseAll$1),
   'TextSearch.collapseDetails': wrapCommand(collapseDetails),
-  'TextSearch.copy': wrapCommand(copy),
+  'TextSearch.copy': wrapCommand(copy$1),
   'TextSearch.copyPath': wrapCommand(copyPath$1),
   'TextSearch.diff2': diff2,
   'TextSearch.dismissItem': wrapCommand(dismissItem),
@@ -5341,6 +5551,7 @@ const commandMap = {
   'TextSearch.focusReplaceValuePrevious': wrapCommand(focusReplaceValuePrevious),
   'TextSearch.focusSearchValue': wrapCommand(focusSearchValue$1),
   'TextSearch.focusSearchValueNext': wrapCommand(focusSearchValueNext),
+  'TextSearch.getMenuEntries': wrapGetter(getMenuEntries),
   'TextSearch.handleClickAt': wrapCommand(handleClickAt),
   'TextSearch.handleContextMenu': wrapCommand(handleContextMenu),
   'TextSearch.handleExcludeInput': wrapCommand(handleExcludeInput),
@@ -5354,7 +5565,12 @@ const commandMap = {
   'TextSearch.handleInput': wrapCommand(handleInput),
   'TextSearch.handleInput2': wrapCommand(handleInput2),
   'TextSearch.handleInputBlur': wrapCommand(handleInputBlur),
+  'TextSearch.handleInputContextMenu': wrapCommand(handleInputContextMenu),
+  'TextSearch.handleInputCopy': wrapCommand(handleInputCopy),
+  'TextSearch.handleInputCut': wrapCommand(handleInputCut),
   'TextSearch.handleInputFocus': wrapCommand(handleInputFocus),
+  'TextSearch.handleInputPaste': wrapCommand(handleInputPaste),
+  'TextSearch.handleInputSelectionChange': wrapCommand(handleInputSelectionChange),
   'TextSearch.handleListBlur': wrapCommand(handleListBlur),
   'TextSearch.handleListFocus': wrapCommand(handleListFocus),
   'TextSearch.handleListPointerDown': wrapCommand(handleListPointerDown),
@@ -5397,7 +5613,6 @@ const commandMap = {
   'TextSearch.terminate': terminate,
   'TextSearch.renderActions': renderActions,
   'TextSearch.getMenuEntryIds': getMenuEntryIds,
-  'TextSearch.getMenuEntries': getMenuEntries,
   // TODO needed?
   'TextSearch.replaceAllAndPrompt': replaceAllAndPrompt,
   'TextSearch.textSearch': textSearch$6

package/static/{c3a0ed8 → 4c41bed}/packages/title-bar-worker/dist/titleBarWorkerMain.js

@@ -1050,6 +1050,8 @@ const About = 'About';
 const CheckForUpdates = 'Check For Updates';
 const ClearRecentlyOpened = 'Clear Recently Opened';
 const Close = 'Close';
+const MenuBar$1 = 'Menu Bar';
+const CommandCenter = 'Command Center';
 const Edit$1 = 'Edit';
 const File$2 = 'File';
 const Go$1 = 'Go';
@@ -1098,6 +1100,12 @@ const maximize$1 = () => {
 const close$1 = () => {
   return i18nString(Close);
 };
+const menuBar = () => {
+  return i18nString(MenuBar$1);
+};
+const commandCenter = () => {
+  return i18nString(CommandCenter);
+};
 
 const getTitleBarButtonsElectron = (controlsOverlayEnabled, titleBarStyleCustom) => {
   if (controlsOverlayEnabled) {
@@ -1618,17 +1626,21 @@ const RestoreFocus = 6;
 const Ignore = 7;
 
 const getMenuEntriesTitleBarContextMenu = async state => {
+  const {
+    titleBarMenuBarEnabled,
+    commandCenterEnabled
+  } = state;
   // TODO checked state should be depending on whether or not that feature is currently visible or not
   return [{
     id: 'MenuBar',
-    label: 'menu bar',
-    flags: Checked,
-    command: ''
+    label: menuBar(),
+    flags: titleBarMenuBarEnabled ? Checked : Unchecked,
+    command: titleBarMenuBarEnabled ? 'TitleBar.hideMenuBar' : 'TitleBar.showMenuBar'
   }, {
     id: 'Command center',
-    label: 'command center',
-    flags: Checked,
-    command: ''
+    label: commandCenter(),
+    flags: commandCenterEnabled ? Checked : Unchecked,
+    command: commandCenterEnabled ? 'TitleBar.hideCommandCenter' : 'TitleBar.showCommandCenter'
   }, {
     id: 'layout controls',
     label: 'layout controls',
@@ -2576,7 +2588,7 @@ const getMenuEntries$1 = async (id, platform) => {
 
 const getMenuEntries2 = async (state, props) => {
   if (props.menuId === MenuIdTitleBarContextMenu) {
-    return getMenuEntriesTitleBarContextMenu();
+    return getMenuEntriesTitleBarContextMenu(state);
   }
   // TODO
   return [];
@@ -2893,11 +2905,18 @@ const handlePointerOver = (state, name) => {
   return handleMouseOver(state, index);
 };
 
-const hideMenuBar = async state => {
+const hideCommandCenter = async state => {
   // TODO
   return state;
 };
 
+const hideMenuBar = async state => {
+  return {
+    ...state,
+    titleBarMenuBarEnabled: false
+  };
+};
+
 const createTextMeasureContext = (letterSpacing, font) => {
   const canvas = new OffscreenCanvas(0, 0);
   const ctx = canvas.getContext('2d');
@@ -3570,11 +3589,18 @@ const saveState = state => {
   };
 };
 
-const showMenuBar = async state => {
+const showCommandCenter = async state => {
   // TODO
   return state;
 };
 
+const showMenuBar = async state => {
+  return {
+    ...state,
+    titleBarMenuBarEnabled: true
+  };
+};
+
 const create = (id, uri, x, y, width, height) => {
   const state = {
     ...createDefaultState(),
@@ -4107,7 +4133,7 @@ const commandMap = {
   'TitleBar.handleClickClose': wrapCommand(handleClickClose),
   'TitleBar.handleClickMinimize': wrapCommand(handleClickMinimize),
   'TitleBar.handleClickToggleMaximize': wrapCommand(handleClickToggleMaximize),
-  'TitleBar.handleContextMenu': handleContextMenu,
+  'TitleBar.handleContextMenu': wrapCommand(handleContextMenu),
   'TitleBar.handleFocus': wrapCommand(handleFocus),
   'TitleBar.handleFocusOut': wrapCommand(handleFocusOut),
   'TitleBar.handleKeyArrowDown': wrapCommand(handleKeyArrowDown),
@@ -4125,12 +4151,14 @@ const commandMap = {
   'TitleBar.handleMouseOver': wrapCommand(handleMouseOver),
   'TitleBar.handlePointerOut': wrapCommand(handlePointerOut),
   'TitleBar.handlePointerOver': wrapCommand(handlePointerOver),
+  'TitleBar.hideCommandCenter': wrapCommand(hideCommandCenter),
   'TitleBar.hideMenuBar': wrapCommand(hideMenuBar),
   'TitleBar.loadContent2': wrapCommand(loadContent2),
   'TitleBar.render3': render3,
   'TitleBar.renderEventListeners': renderEventListeners,
   'TitleBar.resize': wrapCommand(resize),
   'TitleBar.saveState': wrapGetter(saveState),
+  'TitleBar.showCommandCenter': wrapCommand(showCommandCenter),
   'TitleBar.showMenuBar': wrapCommand(showMenuBar),
   'TitleBar.terminate': terminate,
   'TitleBar.toggleIndex': wrapCommand(toggleIndex),

package/static/index.html

@@ -6,9 +6,9 @@
     <meta name="description" content="VS Code inspired text editor that mostly runs in a webworker." />
     <meta name="theme-color" content="#282e2f" />
     <title>Lvce Editor</title>
-    <link rel="stylesheet" href="/c3a0ed8/css/App.css" />
-    <link rel="manifest" href="/c3a0ed8/manifest.json" crossorigin="use-credentials" />
-    <link rel="apple-touch-icon" href="/c3a0ed8/icons/pwa-icon-192.png" />
-    <script type="module" src="/c3a0ed8/packages/renderer-process/dist/rendererProcessMain.js"></script>
+    <link rel="stylesheet" href="/4c41bed/css/App.css" />
+    <link rel="manifest" href="/4c41bed/manifest.json" crossorigin="use-credentials" />
+    <link rel="apple-touch-icon" href="/4c41bed/icons/pwa-icon-192.png" />
+    <script type="module" src="/4c41bed/packages/renderer-process/dist/rendererProcessMain.js"></script>
   </head>
 </html>