@lvce-editor/activity-bar-worker 1.2.0 → 1.4.0

package/dist/activityBarWorkerMain.js

@@ -388,11 +388,11 @@ const remove = id => {
   delete callbacks[id];
 };
 let id = 0;
-const create$3 = () => {
+const create$3$1 = () => {
   return ++id;
 };
 const registerPromise = () => {
-  const id = create$3();
+  const id = create$3$1();
   const {
     resolve,
     promise
@@ -822,7 +822,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$2 = async ({
+const create$3 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -834,7 +834,7 @@ const create$2 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$2
+  create: create$3
 };
 const createMockRpc = ({
   commandMap
@@ -860,7 +860,7 @@ const toCommandId = key => {
   const dotIndex = key.indexOf('.');
   return key.slice(dotIndex + 1);
 };
-const create$1 = () => {
+const create$2 = () => {
   const states = Object.create(null);
   const commandMapRef = {};
   return {
@@ -947,7 +947,70 @@ const {
   getCommandIds,
   wrapGetter,
   wrapCommand
-} = create$1();
+} = create$2();
+
+// TODO parentUid might ot be needed
+const create$1 = (id, uri, x, y, width, height, args, parentUid, platform = 0) => {
+  const state = {
+    currentViewletId: '',
+    uid: id,
+    focus: 0,
+    focused: false,
+    focusedIndex: -1,
+    scrollBarHeight: 0,
+    width: 0,
+    x: 0,
+    y: 0,
+    sideBarVisible: false,
+    activityBarItems: [],
+    selectedIndex: -1
+  };
+  set$3(state.uid, state, state);
+  return state;
+};
+
+const isEqual$2 = (oldState, newState) => {
+  // TODO compute css more optimized
+  // maybe only when items change, and even then not
+  // always, but only when it affects the css
+  return false;
+};
+
+const isEqual$1 = (oldState, newState) => {
+  return oldState.focused === newState.focused && oldState.focus === newState.focus;
+};
+
+const isEqual = (oldState, newState) => {
+  return oldState.focusedIndex === newState.focusedIndex;
+};
+
+const RenderItems = 4;
+const RenderFocus = 6;
+const RenderFocusContext = 7;
+const RenderCss = 11;
+
+const modules = [isEqual, isEqual$1, isEqual$1, isEqual$2];
+const numbers = [RenderItems, RenderFocus, RenderFocusContext, RenderCss];
+
+const diff = (oldState, newState) => {
+  const diffResult = [];
+  for (let i = 0; i < modules.length; i++) {
+    const fn = modules[i];
+    if (!fn(oldState, newState)) {
+      diffResult.push(numbers[i]);
+    }
+  }
+  return diffResult;
+};
+
+const diff2 = uid => {
+  const {
+    oldState,
+    newState
+  } = get$1(uid);
+  const result = diff(oldState, newState);
+  return result;
+};
 
 const List = 1;
 
@@ -991,14 +1054,6 @@ const focusNone = state => {
   return focusIndex(state, -1);
 };
 
-const Button = 'event.button';
-const ClientX = 'event.clientX';
-const ClientY = 'event.clientY';
-const CtrlKey = 'event.ctrlKey';
-const DeltaMode = 'event.deltaMode';
-const DeltaY = 'event.deltaY';
-const TargetValue = 'event.target.value';
-
 const Enter = 3;
 const Space = 9;
 const PageUp = 10;
@@ -1013,7 +1068,11 @@ const LeftClick = 0;
 const DebugWorker = 55;
 const RendererWorker$1 = 1;
 
+const SetDom2 = 'Viewlet.setDom2';
+const SetFocusContext = 'Viewlet.setFocusContext';
+
 const FocusActivityBar = 5;
+const FocusExplorer = 13;
 
 const getKeyBindings$1 = () => {
   return [{
@@ -1501,6 +1560,10 @@ const handleClick = async (state, button, index, x, y) => {
   }
 };
 
+const handleResize = state => {
+  return state;
+};
+
 const findIndex = (activityBarItems, id) => {
   for (let i = 0; i < activityBarItems.length; i++) {
     if (activityBarItems[i].id === id) {
@@ -1518,100 +1581,58 @@ const handleSideBarViewletChange = (state, id, ...args) => {
   };
 };
 
+const loadContent = async (state, savedState) => {
+  return {
+    ...state
+  };
+};
+
+const renderFocusContext = (oldState, newState) => {
+  if (newState.focus === List) {
+    return [SetFocusContext, newState.uid, FocusExplorer];
+  }
+  return [];
+};
+
+const renderItems = (oldState, newState) => {
+  return [SetDom2, []];
+};
+
+const getRenderer = diffType => {
+  switch (diffType) {
+    case RenderItems:
+      return renderItems;
+    case RenderFocusContext:
+      return renderFocusContext;
+    default:
+      throw new Error('unknown renderer');
+  }
+};
+
 const applyRender = (oldState, newState, diffResult) => {
   const commands = [];
+  for (const item of diffResult) {
+    const fn = getRenderer(item);
+    const result = fn(oldState, newState);
+    if (result.length > 0) {
+      commands.push(result);
+    }
+  }
   return commands;
 };
 
 const render2 = (uid, diffResult) => {
   const {
+    oldState,
     newState
   } = get$1(uid);
   set$3(uid, newState, newState);
-  const commands = applyRender();
+  const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
 
-const HandleClick = 1;
-const HandleClickOpenFolder = 2;
-const HandleContextMenu = 3;
-const HandleDragLeave = 4;
-const HandleDragOver = 5;
-const HandleDrop = 6;
-const HandleEditingInput = 7;
-const HandleInputBlur = 8;
-const HandleInputClick = 9;
-const HandleListBlur = 11;
-const HandleListFocus = 12;
-const HandlePointerDown = 14;
-const HandleWheel = 15;
-const HandleDragStart = 17;
-
 const renderEventListeners = () => {
-  return [{
-    name: HandleInputBlur,
-    params: ['handleInputBlur']
-  },
-  // {
-  //   name: DomEventListenersFunctions.HandleInputKeyDown,
-  //   params: ['handleInputKeyDown'],
-  //   stopPropagation: true, // TODO find a way to do this without stopPropagation
-  // },
-  // {
-  //   name: DomEventListenersFunctions.HandleListKeyDown,
-  //   params: ['handleKeyDown', 'event.key'],
-  //   preventDefault: true,
-  // },
-  {
-    name: HandleListFocus,
-    params: ['handleFocus', 'event.isTrusted', 'event.target.className']
-  }, {
-    name: HandleListBlur,
-    params: ['handleBlur']
-  }, {
-    name: HandleClick,
-    params: ['handleClickAt', 'event.defaultPrevented', Button, CtrlKey, 'event.shiftKey', ClientX, ClientY],
-    preventDefault: true
-  }, {
-    name: HandleInputClick,
-    params: ['handleInputClick'],
-    preventDefault: true
-  }, {
-    name: HandleClickOpenFolder,
-    params: ['handleClickOpenFolder'],
-    preventDefault: true
-  }, {
-    name: HandlePointerDown,
-    params: ['handlePointerDown', Button, ClientX, ClientY]
-    // preventDefault: true,
-  }, {
-    name: HandleEditingInput,
-    params: ['updateEditingValue', TargetValue]
-  }, {
-    name: HandleContextMenu,
-    params: ['handleContextMenu', Button, ClientX, ClientY],
-    preventDefault: true
-  }, {
-    name: HandleWheel,
-    params: ['handleWheel', DeltaMode, DeltaY],
-    passive: true
-  }, {
-    name: HandleDragOver,
-    params: ['handleDragOver', ClientX, ClientY],
-    preventDefault: true
-  }, {
-    name: HandleDrop,
-    params: ['handleDrop', ClientX, ClientY, 'event.dataTransfer.files2', 'event.dataTransfer.files'],
-    preventDefault: true
-  }, {
-    name: HandleDragLeave,
-    params: ['handleDragLeave']
-  }, {
-    name: HandleDragStart,
-    params: ['handleDragStart'],
-    // @ts-ignore
-    dragEffect: 'copyMove'
-  }];
+  return [];
 };
 
 const saveState = state => {
@@ -1624,17 +1645,21 @@ const saveState = state => {
 };
 
 const commandMap = {
+  'ActivityBar.create': create$1,
+  'ActivityBar.diff2': diff2,
   'ActivityBar.focus': wrapCommand(focus),
   'ActivityBar.focusFirst': wrapCommand(focusFirst),
   'ActivityBar.focusIndex': wrapCommand(focusIndex),
   'ActivityBar.focusLast': wrapCommand(focusLast),
   'ActivityBar.focusNext': wrapCommand(focusNext),
-  'ActivityBar.handleBlur': wrapCommand(handleBlur),
   'ActivityBar.focusNone': wrapCommand(focusNone),
-  'ActivityBar.handleSideBarViewletChange': wrapCommand(handleSideBarViewletChange),
+  'ActivityBar.getCommandIds': getCommandIds,
   'ActivityBar.getKeyBindings': getKeyBindings$1,
+  'ActivityBar.handleBlur': wrapCommand(handleBlur),
+  'ActivityBar.handleResize': wrapCommand(handleResize),
   'ActivityBar.handleClick': wrapCommand(handleClick),
-  'ActivityBar.getCommandIds': getCommandIds,
+  'ActivityBar.handleSideBarViewletChange': wrapCommand(handleSideBarViewletChange),
+  'ActivityBar.loadContent': wrapCommand(loadContent),
   'ActivityBar.render2': render2,
   'ActivityBar.renderEventListeners': renderEventListeners,
   'ActivityBar.saveState': wrapGetter(saveState),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/activity-bar-worker",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",