@lvce-editor/explorer-view 3.7.0 → 3.9.0

package/dist/explorerViewWorkerMain.js

@@ -1025,6 +1025,22 @@ const WebWorkerRpcClient = {
   __proto__: null,
   create: create$4
 };
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    return command(...params);
+  };
+  const mockRpc = {
+    invoke,
+    invokeAndTransfer: invoke,
+    invocations
+  };
+  return mockRpc;
+};
 
 const CreateFolder$1 = 1;
 const CreateFile$1 = 2;
@@ -1059,6 +1075,9 @@ const DebugWorker = 55;
 const FileSystemWorker$1 = 209;
 const RendererWorker$1 = 1;
 
+const FocusExplorer = 13;
+const FocusExplorerEditBox = 14;
+
 const rpcs = Object.create(null);
 const set$5 = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1432,6 +1451,13 @@ const getLogsDir = async () => {
   // @ts-ignore
   return invoke$2('PlatformPaths.getLogsDir');
 };
+const registerMockRpc = commandMap => {
+  const mockRpc = createMockRpc({
+    commandMap
+  });
+  set$3(mockRpc);
+  return mockRpc;
+};
 
 const RendererWorker = {
   __proto__: null,
@@ -1481,6 +1507,7 @@ const RendererWorker = {
   openUrl,
   openWidget,
   readFile,
+  registerMockRpc,
   registerWebViewInterceptor,
   renderMarkdown,
   rerenderEditor,
@@ -2038,6 +2065,11 @@ const treeToArray = (map, root) => {
   return items;
 };
 
+const EmptyString = '';
+const Slash$1 = '/';
+const Dot = '.';
+const BackSlash = '\\';
+
 const emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
@@ -2058,6 +2090,8 @@ const Cut = 'Cut';
 const Delete = 'Delete';
 const FileNameCannotStartWithSlash = 'A file or folder name cannot start with a slash.';
 const FileOrFolderNameMustBeProvider = 'A file or folder name must be provided.';
+const FileCannotStartWithDot = 'A file or folder name cannot start with a dot.';
+const FileCannotStartWithBackSlash = 'A file or folder name cannot start with a backslash.';
 const FilesExplorer = 'Files Explorer';
 const NewFile$1 = 'New File...';
 const NewFolder$1 = 'New Folder...';
@@ -2124,6 +2158,12 @@ const fileOrFolderNameMustBeProvided = () => {
 const fileCannotStartWithSlash = () => {
   return i18nString(FileNameCannotStartWithSlash);
 };
+const fileCannotStartWithDot = () => {
+  return i18nString(FileCannotStartWithDot);
+};
+const fileCannotStartWithBackSlash = () => {
+  return i18nString(FileCannotStartWithBackSlash);
+};
 const typeAFileName = () => {
   return i18nString(TypeAFileName);
 };
@@ -2133,9 +2173,15 @@ const validateFileName2 = name => {
     const editingErrorMessage = fileOrFolderNameMustBeProvided();
     return editingErrorMessage;
   }
-  if (name.startsWith('/')) {
+  if (name.startsWith(Dot)) {
+    return fileCannotStartWithDot();
+  }
+  if (name.startsWith(Slash$1)) {
     return fileCannotStartWithSlash();
   }
+  if (name.startsWith(BackSlash)) {
+    return fileCannotStartWithBackSlash();
+  }
   return '';
 };
 
@@ -2321,12 +2367,17 @@ const isNormalItem = item => {
   return item.type !== EditingFile && item.type !== EditingFolder;
 };
 
-const cancelEditCreate = (state, keepFocus) => {
+const cancelEditCreate = async (state, keepFocus) => {
   const {
     editingIndex,
-    items
+    items,
+    fileIconCache
   } = state;
   const filteredItems = items.filter(isNormalItem);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(filteredItems, fileIconCache);
   return {
     ...state,
     items: filteredItems,
@@ -2336,7 +2387,9 @@ const cancelEditCreate = (state, keepFocus) => {
     editingValue: '',
     editingErrorMessage: '',
     editingType: None$5,
-    focus: List
+    focus: List,
+    icons,
+    fileIconCache: newFileIconCache
   };
 };
 
@@ -2378,7 +2431,7 @@ const cancelEditRename = (state, keepFocus) => {
   };
 };
 
-const cancelEditInternal = (state, keepFocus) => {
+const cancelEditInternal = async (state, keepFocus) => {
   const {
     editingType
   } = state;
@@ -2388,7 +2441,7 @@ const cancelEditInternal = (state, keepFocus) => {
   return cancelEditCreate(state, keepFocus);
 };
 
-const cancelEdit = state => {
+const cancelEdit = async state => {
   return cancelEditInternal(state, true);
 };
 
@@ -2563,7 +2616,9 @@ const create$1 = () => {
 const {
   get,
   set,
-  wrapCommand
+  wrapCommand,
+  registerCommands,
+  getCommandIds
 } = create$1();
 
 const ListItem = 22;
@@ -2616,7 +2671,8 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
     pasteShouldMove: false,
     cutItems: [],
     isPointerDown: false,
-    pointerDownIndex: -1
+    pointerDownIndex: -1,
+    sourceControlIgnoredUris: []
   };
   set(uid, state, state);
 };
@@ -2667,40 +2723,36 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     pasteShouldMove: false,
     cutItems: [],
     isPointerDown: false,
-    pointerDownIndex: -1
+    pointerDownIndex: -1,
+    sourceControlIgnoredUris: []
   };
   set(state.uid, state, state);
   return state;
 };
 
-const RenderItems = 4;
-const RenderFocus = 6;
-const RenderFocusContext = 7;
-const RenderValue = 8;
-const RenderSelection = 9;
-const RenderDragData = 10;
-
-const diffType$4 = RenderDragData;
 const isEqual$5 = (oldState, newState) => {
   return oldState.isPointerDown || !newState.isPointerDown;
 };
 
-const diffType$3 = RenderFocus;
 const isEqual$4 = (oldState, newState) => {
   return oldState.focused === newState.focused && oldState.focus === newState.focus;
 };
 
-const diffType$2 = RenderItems;
 const isEqual$3 = (oldState, newState) => {
   return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.focusedIndex === newState.focusedIndex && oldState.editingIndex === newState.editingIndex && oldState.editingType === newState.editingType && oldState.editingValue === newState.editingValue && oldState.editingErrorMessage === newState.editingErrorMessage && oldState.width === newState.width && oldState.focused === newState.focused && oldState.dropTargets === newState.dropTargets && oldState.icons === newState.icons && oldState.cutItems === newState.cutItems;
 };
 
-const diffType$1 = RenderSelection;
 const isEqual$2 = (oldState, newState) => {
   return oldState.editingSelectionStart === newState.editingSelectionStart && oldState.editingSelectionEnd === newState.editingSelectionEnd;
 };
 
-const diffType = RenderValue;
+const RenderItems = 4;
+const RenderFocus = 6;
+const RenderFocusContext = 7;
+const RenderValue = 8;
+const RenderSelection = 9;
+const RenderDragData = 10;
+
 const isEqual$1 = (oldState, newState) => {
   if (newState.focus !== Input$1) {
     return true;
@@ -2709,7 +2761,7 @@ const isEqual$1 = (oldState, newState) => {
 };
 
 const modules = [isEqual$3, isEqual$4, isEqual$4, isEqual$1, isEqual$2, isEqual$5];
-const numbers = [diffType$2, diffType$3, RenderFocusContext, diffType, diffType$1, diffType$4];
+const numbers = [RenderItems, RenderFocus, RenderFocusContext, RenderValue, RenderSelection, RenderDragData];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -3011,12 +3063,6 @@ const focusPrevious = state => {
   }
 };
 
-const commandIds = ['acceptEdit', 'cancelEdit', 'cancelTypeAhead', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'getMouseActions', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleCut', 'handleDragLeave', 'handleDragOver', 'handleDragOverIndex', 'handleDragStart', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleInputBlur', 'handleInputClick', 'handleInputKeyDown', 'handleKeyDown', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectIndices', 'selectUp', 'setDeltaY', 'setSelectedIndices', 'toggleIndividualSelection', 'updateEditingValue', 'updateIcons'];
-
-const getCommandIds = () => {
-  return commandIds;
-};
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -3036,9 +3082,6 @@ const text = data => {
   };
 };
 
-const FocusExplorer = 13;
-const FocusExplorerEditBox = 14;
-
 const getKeyBindings = () => {
   return [{
     key: Shift | UpArrow,
@@ -3124,6 +3167,10 @@ const getKeyBindings = () => {
     key: Enter,
     command: 'Explorer.handleClickCurrent',
     when: FocusExplorer
+  }, {
+    key: Escape,
+    command: 'Explorer.handleEscape',
+    when: FocusExplorer
   }, {
     key: CtrlCmd | KeyA,
     command: 'Explorer.selectAll',
@@ -4305,6 +4352,13 @@ const handleDrop = async (state, x, y, fileIds, fileList) => {
   }
 };
 
+const handleEscape = async state => {
+  return {
+    ...state,
+    cutItems: []
+  };
+};
+
 const handleFocus = async state => {
   await setFocus(FocusExplorer);
   return state;
@@ -4747,8 +4801,6 @@ const getSettings = async () => {
   };
 };
 
-const EmptyString = '';
-
 const getSavedChildDirents = (map, path, depth, excluded, pathSeparator) => {
   let children = map[path];
   if (!children) {
@@ -5292,10 +5344,10 @@ const renderFocus = (oldState, newState) => {
 
 const renderFocusContext = (oldState, newState) => {
   if (newState.focus === Input$1) {
-    return ['Viewlet.setFocusContext', FocusExplorerEditBox];
+    return ['Viewlet.setFocusContext', newState.uid, FocusExplorerEditBox];
   }
   if (newState.focus === List) {
-    return ['Viewlet.setFocusContext', FocusExplorer];
+    return ['Viewlet.setFocusContext', newState.uid, FocusExplorer];
   }
   return [];
 };
@@ -5467,8 +5519,8 @@ const label = {
   className: Label,
   childCount: 1
 };
-const getLabelDom = (name, isCut) => {
-  if (isCut) {
+const getLabelDom = (name, isDimmed) => {
+  if (isDimmed) {
     return [{
       type: Div,
       className: mergeClassNames(Label, LabelCut),
@@ -5478,11 +5530,11 @@ const getLabelDom = (name, isCut) => {
   return [label, text(name)];
 };
 
-const getInputOrLabelDom = (isEditing, hasEditingError, name, isCut) => {
+const getInputOrLabelDom = (isEditing, hasEditingError, name, isCut, isIgnored) => {
   if (isEditing) {
     return getInputDom(hasEditingError);
   }
-  return getLabelDom(name, isCut);
+  return getLabelDom(name, isCut || isIgnored);
 };
 
 const getExplorerItemVirtualDom = item => {
@@ -5501,6 +5553,7 @@ const getExplorerItemVirtualDom = item => {
     setSize,
     posInSet,
     isCut,
+    isIgnored,
     index
   } = item;
   const chevronDom = getChevronVirtualDom(chevron);
@@ -5520,7 +5573,7 @@ const getExplorerItemVirtualDom = item => {
     ariaDescription: '',
     id,
     'data-index': index
-  }, ...chevronDom, getFileIconVirtualDom(icon), ...getInputOrLabelDom(isEditing, hasEditingError, name, isCut)];
+  }, ...chevronDom, getFileIconVirtualDom(icon), ...getInputOrLabelDom(isEditing, hasEditingError, name, isCut, isIgnored)];
 };
 
 const getActiveDescendant = focusedIndex => {
@@ -5694,7 +5747,7 @@ const getEditingChevron = direntType => {
       return None$1;
   }
 };
-const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingType, editingValue, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems) => {
+const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingType, editingValue, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems, sourceControlIgnoredUris = []) => {
   const visible = [];
   const indentFn = useChevrons ? getTreeItemIndentWithChevron : getTreeItemIndent;
   let iconIndex = 0;
@@ -5706,6 +5759,7 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
     const isSelected = item.selected;
     const isCut = cutItems.includes(item.path);
     const isDropping = dropTargets.includes(i);
+    const isIgnored = sourceControlIgnoredUris.includes(item.path);
     const className = getTreeItemClassName(isSelected, isFocused, isDropping); // TODO compute classname in dom function
     const expanded = getExpandedType(item.type);
     const ariaExpanded = ariaExpandedValues[expanded];
@@ -5729,6 +5783,7 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
       id,
       className,
       isCut,
+      isIgnored,
       index: i
     });
   }
@@ -5738,6 +5793,7 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
 const renderItems = (oldState, newState) => {
   const {
     cutItems,
+    sourceControlIgnoredUris,
     deltaY,
     dropTargets,
     editingErrorMessage,
@@ -5757,7 +5813,7 @@ const renderItems = (oldState, newState) => {
     useChevrons,
     width
   } = newState;
-  const visibleDirents = getVisibleExplorerItems(items, minLineY, maxLineY, focusedIndex, editingIndex, editingType, editingValue, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems);
+  const visibleDirents = getVisibleExplorerItems(items, minLineY, maxLineY, focusedIndex, editingIndex, editingType, editingValue, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems, sourceControlIgnoredUris);
   const isWide = width > 450;
   const contentHeight = items.length * itemHeight;
   const depth = items[focusedIndex]?.depth || 0;
@@ -6280,6 +6336,7 @@ const commandMap = {
   'Explorer.getMouseActions': getMouseActions,
   'Explorer.handleArrowLeft': wrapCommand(handleArrowLeft),
   'Explorer.handleArrowRight': wrapCommand(handleArrowRight),
+  'Explorer.handleEscape': wrapCommand(handleEscape),
   'Explorer.handleBlur': wrapCommand(handleBlur),
   'Explorer.handleClick': wrapCommand(handleClick),
   'Explorer.handleClickAt': wrapCommand(handleClickAt),
@@ -6338,6 +6395,7 @@ const commandMap = {
 };
 
 const listen = async () => {
+  registerCommands(commandMap);
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "3.7.0",
+  "version": "3.9.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",