@lvce-editor/explorer-view 2.57.0 → 2.58.0

package/dist/explorerViewWorkerMain.js

@@ -1995,7 +1995,8 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
     scrollBarActive: false,
     scrollBarHeight: 0,
     confirmPaste: false,
-    pasteShouldMove: false
+    pasteShouldMove: false,
+    cutItems: []
   };
   set(uid, state, state);
 };
@@ -2043,7 +2044,8 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     scrollBarActive: false,
     scrollBarHeight: 0,
     confirmPaste: false,
-    pasteShouldMove: false
+    pasteShouldMove: false,
+    cutItems: []
   };
   set(state.uid, state, state);
   return state;
@@ -2062,7 +2064,7 @@ const isEqual$4 = (oldState, newState) => {
 
 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;
+  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;
@@ -2400,8 +2402,45 @@ const Delete = 18;
 const KeyA = 29;
 const KeyC = 31;
 const KeyV = 50;
+const KeyX = 52;
 const F2 = 58;
 const Star = 131;
+const KeyCode = {
+  __proto__: null,
+  Delete,
+  DownArrow,
+  End,
+  Enter,
+  Escape,
+  F2,
+  Home,
+  KeyA,
+  KeyC,
+  KeyV,
+  KeyX,
+  LeftArrow,
+  RightArrow,
+  Space,
+  Star,
+  UpArrow
+};
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+const px = value => {
+  return `${value}px`;
+};
+const position = (x, y) => {
+  return `${x}px ${y}px`;
+};
+const Text = 12;
+const text = data => {
+  return {
+    type: Text,
+    text: data,
+    childCount: 0
+  };
+};
 
 const CtrlCmd = 1 << 11 >>> 0;
 const Shift = 1 << 10 >>> 0;
@@ -2412,87 +2451,91 @@ const FocusExplorerEditBox = 14;
 
 const getKeyBindings = () => {
   return [{
-    key: Shift | UpArrow,
+    key: Shift | KeyCode.UpArrow,
     command: 'Explorer.selectUp',
     when: FocusExplorer
   }, {
-    key: Shift | DownArrow,
+    key: Shift | KeyCode.DownArrow,
     command: 'Explorer.selectDown',
     when: FocusExplorer
   }, {
-    key: RightArrow,
+    key: KeyCode.RightArrow,
     command: 'Explorer.handleArrowRight',
     when: FocusExplorer
   }, {
-    key: LeftArrow,
+    key: KeyCode.LeftArrow,
     command: 'Explorer.handleArrowLeft',
     when: FocusExplorer
   }, {
-    key: Home,
+    key: KeyCode.Home,
     command: 'Explorer.focusFirst',
     when: FocusExplorer
   }, {
-    key: End,
+    key: KeyCode.End,
     command: 'Explorer.focusLast',
     when: FocusExplorer
   }, {
-    key: UpArrow,
+    key: KeyCode.UpArrow,
     command: 'Explorer.focusPrevious',
     when: FocusExplorer
   }, {
-    key: DownArrow,
+    key: KeyCode.DownArrow,
     command: 'Explorer.focusNext',
     when: FocusExplorer
   }, {
-    key: CtrlCmd | Star,
+    key: CtrlCmd | KeyCode.Star,
     command: 'Explorer.expandAll',
     when: FocusExplorer
   }, {
-    key: Alt | RightArrow,
+    key: Alt | KeyCode.RightArrow,
     command: 'Explorer.expandRecursively',
     when: FocusExplorer
   }, {
-    key: CtrlCmd | LeftArrow,
+    key: CtrlCmd | KeyCode.LeftArrow,
     command: 'Explorer.collapseAll',
     when: FocusExplorer
   }, {
-    key: CtrlCmd | KeyV,
+    key: CtrlCmd | KeyCode.KeyV,
     command: 'Explorer.handlePaste',
     when: FocusExplorer
   }, {
-    key: CtrlCmd | KeyC,
+    key: CtrlCmd | KeyCode.KeyC,
     command: 'Explorer.handleCopy',
     when: FocusExplorer
   }, {
-    key: F2,
+    key: CtrlCmd | KeyCode.KeyX,
+    command: 'Explorer.handleCut',
+    when: FocusExplorer
+  }, {
+    key: KeyCode.F2,
     command: 'Explorer.renameDirent',
     when: FocusExplorer
   }, {
-    key: Escape,
+    key: KeyCode.Escape,
     command: 'Explorer.cancelEdit',
     when: FocusExplorerEditBox
   }, {
-    key: Enter,
+    key: KeyCode.Enter,
     command: 'Explorer.acceptEdit',
     when: FocusExplorerEditBox
   }, {
-    key: Delete,
+    key: KeyCode.Delete,
     command: 'Explorer.removeDirent',
     when: FocusExplorer
   }, {
-    key: Escape,
+    key: KeyCode.Escape,
     command: 'Explorer.focusNone',
     when: FocusExplorer
   }, {
-    key: Space,
+    key: KeyCode.Space,
     command: 'Explorer.handleClickCurrentButKeepFocus',
     when: FocusExplorer
   }, {
-    key: Enter,
+    key: KeyCode.Enter,
     command: 'Explorer.handleClickCurrent',
     when: FocusExplorer
   }, {
-    key: CtrlCmd | KeyA,
+    key: CtrlCmd | KeyCode.KeyA,
     command: 'Explorer.selectAll',
     when: FocusExplorer
   }];
@@ -3148,7 +3191,8 @@ const handleCut = async state => {
   await writeNativeFiles('cut', files);
   return {
     ...state,
-    pasteShouldMove: true
+    pasteShouldMove: true,
+    cutItems: files
   };
 };
 
@@ -4556,22 +4600,34 @@ const ToolBar = 'toolbar';
 const Tree = 'tree';
 const TreeItem$1 = 'treeitem';
 
+// 0 = 'Button'
+// 1 = 'IconButton'
+// 2 = 'Button IconButton'
+// it could make dom diffing faster, since for classname,
+// once at start, send all classnames to renderer process
+// only numbers are compared. it could also make rendering faster,
+// representing the concatenated strings for example
+// since less data is transferred to renderer process
+// then, components uses numeric classname
+// TODO add option to make classnames numeric
+// when a component uses multiple classnames, it is a new number
 const Actions = 'Actions';
 const Button$2 = 'Button';
 const ButtonNarrow = 'ButtonNarrow';
 const ButtonPrimary = 'ButtonPrimary';
 const ButtonWide = 'ButtonWide';
 const Chevron = 'Chevron';
-const ExplorerErrorMessage = 'ExplorerErrorMessage';
 const Empty = '';
 const Explorer = 'Explorer';
 const ExplorerDropTarget = 'DropTarget';
+const ExplorerErrorMessage = 'ExplorerErrorMessage';
 const ExplorerInputBox = 'ExplorerInputBox';
 const FileIcon = 'FileIcon';
 const FocusOutline = 'FocusOutline';
 const IconButton = 'IconButton';
 const InputValidationError = 'InputValidationError';
 const Label = 'Label';
+const LabelCut = 'LabelCut';
 const ListItems = 'ListItems';
 const MaskIconChevronDown = 'MaskIconChevronDown';
 const MaskIconChevronRight = 'MaskIconChevronRight';
@@ -4584,36 +4640,6 @@ const Viewlet = 'Viewlet';
 const Welcome = 'Welcome';
 const WelcomeMessage = 'WelcomeMessage';
 
-// TODO add option to make classnames numeric
-// once at start, send all classnames to renderer process
-// then, components uses numeric classname
-// when a component uses multiple classnames, it is a new number
-// representing the concatenated strings for example
-// 0 = 'Button'
-// 1 = 'IconButton'
-// 2 = 'Button IconButton'
-// it could make dom diffing faster, since for classname,
-// only numbers are compared. it could also make rendering faster,
-// since less data is transferred to renderer process
-
-const mergeClassNames = (...classNames) => {
-  return classNames.filter(Boolean).join(' ');
-};
-const px = value => {
-  return `${value}px`;
-};
-const position = (x, y) => {
-  return `${x}px ${y}px`;
-};
-const Text = 12;
-const text = data => {
-  return {
-    type: Text,
-    text: data,
-    childCount: 0
-  };
-};
-
 const Button$1 = 1;
 const Div = 4;
 const Input = 6;
@@ -4726,15 +4752,22 @@ const label = {
   className: Label,
   childCount: 1
 };
-const getLabelDom = name => {
+const getLabelDom = (name, isCut) => {
+  if (isCut) {
+    return [{
+      type: Div,
+      className: mergeClassNames(Label, LabelCut),
+      childCount: 1
+    }, text(name)];
+  }
   return [label, text(name)];
 };
 
-const getInputOrLabelDom = (isEditing, hasEditingError, name) => {
+const getInputOrLabelDom = (isEditing, hasEditingError, name, isCut) => {
   if (isEditing) {
     return getInputDom(hasEditingError);
   }
-  return getLabelDom(name);
+  return getLabelDom(name, isCut);
 };
 
 const getExplorerItemVirtualDom = item => {
@@ -4751,7 +4784,8 @@ const getExplorerItemVirtualDom = item => {
     name,
     path,
     setSize,
-    posInSet
+    posInSet,
+    isCut
   } = item;
   const chevronDom = getChevronVirtualDom(chevron);
   return [{
@@ -4769,7 +4803,7 @@ const getExplorerItemVirtualDom = item => {
     ariaExpanded,
     ariaDescription: '',
     id
-  }, ...chevronDom, getFileIconVirtualDom(icon), ...getInputOrLabelDom(isEditing, hasEditingError, name)];
+  }, ...chevronDom, getFileIconVirtualDom(icon), ...getInputOrLabelDom(isEditing, hasEditingError, name, isCut)];
 };
 
 const getActiveDescendant = focusedIndex => {
@@ -4943,7 +4977,7 @@ const getEditingChevron = direntType => {
       return None$1;
   }
 };
-const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingType, editingValue, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon) => {
+const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingType, editingValue, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems) => {
   const visible = [];
   const indentFn = useChevrons ? getTreeItemIndentWithChevron : getTreeItemIndent;
   let iconIndex = 0;
@@ -4953,7 +4987,8 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
     const isFocused = i === focusedIndex;
     const id = isFocused ? 'TreeItemActive' : undefined;
     const isSelected = item.selected;
-    const className = getTreeItemClassName(isSelected, isFocused);
+    const isCut = cutItems.includes(item.path);
+    const className = getTreeItemClassName(isSelected, isFocused); // TODO compute classname in dom function
     const expanded = getExpandedType(item.type);
     const ariaExpanded = ariaExpandedValues[expanded];
     const isEditing = i === editingIndex;
@@ -4974,17 +5009,39 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
       ariaExpanded,
       chevron,
       id,
-      className
+      className,
+      isCut
     });
   }
   return visible;
 };
 
 const renderItems = (oldState, newState) => {
-  const visibleDirents = getVisibleExplorerItems(newState.items, newState.minLineY, newState.maxLineY, newState.focusedIndex, newState.editingIndex, newState.editingType, newState.editingValue, newState.editingErrorMessage, newState.icons, newState.useChevrons, newState.dropTargets, newState.editingIcon);
-  const isWide = newState.width > 450;
-  const contentHeight = newState.items.length * newState.itemHeight;
-  const depth = newState.items[newState.focusedIndex]?.depth || 0;
+  const {
+    items,
+    minLineY,
+    maxLineY,
+    focusedIndex,
+    editingIndex,
+    editingType,
+    editingValue,
+    editingErrorMessage,
+    icons,
+    useChevrons,
+    dropTargets,
+    editingIcon,
+    itemHeight,
+    width,
+    root,
+    deltaY,
+    focused,
+    height,
+    cutItems
+  } = newState;
+  const visibleDirents = getVisibleExplorerItems(items, minLineY, maxLineY, focusedIndex, editingIndex, editingType, editingValue, editingErrorMessage, icons, useChevrons, dropTargets, editingIcon, cutItems);
+  const isWide = width > 450;
+  const contentHeight = items.length * itemHeight;
+  const depth = items[focusedIndex]?.depth || 0;
   const indent = 8;
   const padding = 10;
   const fileIconWidth = 16;
@@ -4993,8 +5050,8 @@ const renderItems = (oldState, newState) => {
   const {
     top,
     left
-  } = getErrorMessagePosition(newState.itemHeight, newState.focusedIndex, newState.minLineY, depth, indent, fileIconWidth, padding + defaultPaddingLeft + chevronSpace);
-  const dom = getExplorerVirtualDom(visibleDirents, newState.focusedIndex, newState.root, isWide, newState.focused, newState.dropTargets, newState.height, contentHeight, newState.deltaY, newState.editingErrorMessage, top, left);
+  } = getErrorMessagePosition(itemHeight, focusedIndex, minLineY, depth, indent, fileIconWidth, padding + defaultPaddingLeft + chevronSpace);
+  const dom = getExplorerVirtualDom(visibleDirents, focusedIndex, root, isWide, focused, dropTargets, height, contentHeight, deltaY, editingErrorMessage, top, left);
   return ['Viewlet.setDom2', dom];
 };
 

package/package.json

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