@lvce-editor/main-area-worker 1.5.0 → 1.7.0

package/dist/mainAreaWorkerMain.js

@@ -102,12 +102,6 @@ const number = value => {
     throw new AssertionError('expected value to be of type number');
   }
 };
-const string = value => {
-  const type = getType(value);
-  if (type !== String) {
-    throw new AssertionError('expected value to be of type string');
-  }
-};
 
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
@@ -462,7 +456,7 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   return promise;
 };
 const Message$1 = 3;
-const create$5$1 = async ({
+const create$5 = async ({
   isMessagePortOpen,
   messagePort
 }) => {
@@ -513,7 +507,7 @@ const wrap$5 = messagePort => {
 };
 const IpcParentWithMessagePort$1 = {
   __proto__: null,
-  create: create$5$1,
+  create: create$5,
   signal: signal$1,
   wrap: wrap$5
 };
@@ -732,7 +726,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$2(id, errorProperty);
 };
-const create$5 = (message, result) => {
+const create$3 = (message, result) => {
   return {
     jsonrpc: Two$1,
     id: message.id,
@@ -741,7 +735,7 @@ const create$5 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$5(message, resultProperty);
+  return create$3(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -1065,7 +1059,7 @@ const remove = id => {
 };
 
 /* eslint-disable  @typescript-eslint/explicit-function-return-type */
-const create$3 = rpcId => {
+const create$2 = rpcId => {
   return {
     async dispose() {
       const rpc = get$1(rpcId);
@@ -1103,12 +1097,12 @@ const create$3 = rpcId => {
 
 const {
   set: set$2
-} = create$3(ExtensionHostWorker);
+} = create$2(ExtensionHostWorker);
 
 const {
   invokeAndTransfer,
   set: set$1
-} = create$3(RendererWorker);
+} = create$2(RendererWorker);
 const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
   const command = 'HandleMessagePort.handleMessagePort2';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
@@ -1118,7 +1112,7 @@ const toCommandId = key => {
   const dotIndex = key.indexOf('.');
   return key.slice(dotIndex + 1);
 };
-const create$2 = () => {
+const create$1 = () => {
   const states = Object.create(null);
   const commandMapRef = {};
   return {
@@ -1204,9 +1198,9 @@ const {
   getCommandIds,
   registerCommands,
   set,
-  wrapCommand} = create$2();
+  wrapCommand} = create$1();
 
-const create$1 = (uid, uri, x, y, width, height, platform, assetDir) => {
+const create = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
     assetDir,
     layout: {
@@ -1261,6 +1255,47 @@ const handleClickCloseTab = (state, groupId, tabId) => {
   return state;
 };
 
+const handleClickTab = async (state, groupIndex, index) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+
+  // Validate indexes
+  if (groupIndex < 0 || groupIndex >= groups.length) {
+    return state;
+  }
+  const group = groups[groupIndex];
+  if (index < 0 || index >= group.tabs.length) {
+    return state;
+  }
+  const tab = group.tabs[index];
+  const groupId = group.id;
+  const tabId = tab.id;
+
+  // Return same state if this group and tab are already active
+  if (layout.activeGroupId === groupId && group.activeTabId === tabId) {
+    return state;
+  }
+
+  // Update the groups array with the new active tab and active group
+  const updatedGroups = groups.map((g, i) => ({
+    ...g,
+    activeTabId: i === groupIndex ? tabId : g.activeTabId,
+    focused: i === groupIndex
+  }));
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      activeGroupId: groupId,
+      groups: updatedGroups
+    }
+  };
+};
+
 const id = 7201;
 const sendMessagePortToExtensionHostWorker = async port => {
   await sendMessagePortToExtensionHostWorker$1(port, id);
@@ -1303,7 +1338,7 @@ const loadContent = async state => {
       activeGroupId: '0',
       direction: 'horizontal',
       groups: [{
-        activeTabId: '',
+        activeTabId: tabs.length > 0 ? tabs[0].id : undefined,
         direction: 'horizontal',
         focused: false,
         id: '0',
@@ -1314,263 +1349,13 @@ const loadContent = async state => {
   };
 };
 
-let idCounter = 0;
-const create = () => {
-  idCounter++;
-  return idCounter;
-};
-
-const getTitle = (uri, homeDir) => {
-  if (!uri) {
-    return '';
-  }
-  return uri;
-};
-const getLabel = uri => {
-  if (uri.startsWith('settings://')) {
-    return 'Settings';
-  }
-  if (uri.startsWith('simple-browser://')) {
-    return 'Simple Browser';
-  }
-  return uri;
-  // return Workspace.pathBaseName(uri)
-};
-
-/**
- *
- * @param {string} uri
- * @returns
- */
-const getFileIcon = uri => {
-  if (uri === 'app://keybindings') {
-    return `MaskIconRecordKey`;
-  }
-  if (uri.startsWith('extension-detail://')) {
-    return `MaskIconExtensions`;
-  }
-  return '';
-};
-
-const Preview = 1 << 4;
-
-// @ts-nocheck
-
-const focusIndex = async (state, index) => {
-  const {
-    activeGroupIndex,
-    groups,
-    tabHeight,
-    uid
-  } = state;
-  const group = groups[activeGroupIndex];
-  const {
-    editors
-  } = group;
-  const oldActiveIndex = group.activeIndex;
-  if (index === oldActiveIndex) {
-    return {
-      commands: [],
-      newState: state
-    };
-  }
-  const newGroup = {
-    ...group,
-    activeIndex: index
-  };
-  const newGroups = [...groups.slice(0, activeGroupIndex), newGroup, ...groups.slice(activeGroupIndex + 1)];
-  const newState = {
-    ...state,
-    groups: newGroups
-  };
-  const editor = editors[index];
-  const {
-    x
-  } = group;
-  const y = group.y + tabHeight;
-  const {
-    width
-  } = group;
-  const contentHeight = group.height - tabHeight;
-  const id = await ViewletMap.getModuleId(editor.uri);
-  const oldEditor = editors[oldActiveIndex];
-  const oldId = await ViewletMap.getModuleId(oldEditor.uri);
-  // @ts-ignore
-  ViewletStates.getInstance(oldId);
-  const previousUid = oldEditor.uid;
-  number(previousUid);
-  const disposeCommands = Viewlet.disposeFunctional(previousUid);
-  const maybeHiddenEditorInstance = ViewletStates.getInstance(editor.uid);
-  if (maybeHiddenEditorInstance) {
-    const commands = Viewlet.showFunctional(editor.uid);
-    const allCommands = [...disposeCommands, ...commands];
-    return {
-      commands: allCommands,
-      newState
-    };
-  }
-  const instanceUid = create();
-  const instance = ViewletManager.create(ViewletModule.load, id, uid, editor.uri, x, y, width, contentHeight);
-  instance.show = false;
-  instance.setBounds = false;
-  instance.uid = instanceUid;
-  editor.uid = instanceUid;
-  const resizeCommands = ['Viewlet.setBounds', instanceUid, x, tabHeight, width, contentHeight];
-
-  // @ts-ignore
-  const commands = await ViewletManager.load(instance);
-  // @ts-ignore
-  commands.unshift(...disposeCommands);
-  // @ts-ignore
-  commands.push(resizeCommands);
-  // @ts-ignore
-  commands.push(['Viewlet.append', uid, instanceUid]);
-  return {
-    commands,
-    newState
-  };
-};
-
-// @ts-nocheck
-const openUri = async (state, uri, focus = true, {
-  preview = false,
-  ...context
-} = {}) => {
+const openUri = async (state, options) => {
   object(state);
-  string(uri);
-  const {
-    activeGroupIndex,
-    groups,
-    tabFontFamily,
-    tabFontSize,
-    tabFontWeight,
-    tabHeight,
-    tabLetterSpacing
-  } = state;
-  const {
-    x
-  } = state;
-  const y = state.y + tabHeight;
-  const {
-    width
-  } = state;
-  const contentHeight = state.height - tabHeight;
-  // @ts-ignore
-  const moduleId = await ViewletMap.getModuleId(uri, context.opener);
-  let activeGroup = groups[activeGroupIndex];
-  activeGroup ||= {
-    activeIndex: -1,
-    editors: [],
-    focusedIndex: -1,
-    height: state.height,
-    tabsUid: create(),
-    uid: create(),
-    width,
-    x,
-    y: 0
-  };
-  const {
-    activeIndex,
-    editors
-  } = activeGroup;
-  const previousEditor = editors[activeIndex];
-  let disposeCommands;
-  // @ts-ignore
-  if (previousEditor && previousEditor.uri === uri && previousEditor.opener === context.opener) {
-    return {
-      commands: [],
-      newState: state
-    };
-  }
-  for (let i = 0; i < editors.length; i++) {
-    const editor = editors[i];
-    if (editor.uri === uri &&
-    // @ts-ignore
-    editor.opener === context.opener) {
-      return focusIndex(state, i);
-    }
-  }
-  // TODO editor needs to be disposed when closing
-  //  other tabs and closing all tabs
-  if (previousEditor) {
-    const previousUid = previousEditor.uid;
-    disposeCommands = Viewlet.hideFunctional(previousUid);
-  }
-  const instanceUid = create();
-  const instance = ViewletManager.create(ViewletModule.load, moduleId, state.uid, uri, activeGroup.x, y, activeGroup.width, contentHeight);
-  instance.uid = instanceUid;
-  // const oldActiveIndex = state.activeIndex
-  const tabLabel = getLabel(uri);
-  const tabWidth = MeasureTabWidth.measureTabWidth(tabLabel, tabFontWeight, tabFontSize, tabFontFamily, tabLetterSpacing);
-  const tabTitle = getTitle(uri);
-  const icon = getFileIcon(uri);
-  const newEditor = {
-    flags: Preview,
-    icon,
-    label: tabLabel,
-    moduleId,
-    tabWidth,
-    title: tabTitle,
-    uid: instanceUid,
-    uri
-  };
-  const newEditors = [...activeGroup.editors, newEditor];
-  const newActiveIndex = newEditors.length - 1;
-  const newGroup = {
-    ...activeGroup,
-    activeIndex: newActiveIndex,
-    editors: newEditors
-  };
-  const newGroups = [...groups.slice(0, activeGroupIndex), newGroup, ...groups.slice(activeGroupIndex + 1)];
-  // @ts-ignore
-  instance.show = false;
-  instance.setBounds = false;
-  ViewletStates.setState(state.uid, {
-    ...state,
-    activeGroupIndex: 0,
-    groups: newGroups,
-    pendingUid: instanceUid
-  });
-  if (context) {
-    instance.args = [context];
-  }
-  // @ts-ignore
-  const commands = await ViewletManager.load(instance, focus);
-  commands.push(['Viewlet.setBounds', instanceUid, activeGroup.x, tabHeight, activeGroup.width, contentHeight]);
-  let {
-    tabsUid
-  } = state;
-  if (tabsUid === -1) {
-    tabsUid = create();
-  }
-  if (disposeCommands) {
-    commands.push(...disposeCommands);
-  }
-  commands.push(['Viewlet.append', state.uid, instanceUid]);
-  if (focus) {
-    commands.push(['Viewlet.focus', instanceUid]);
-  }
-  const latestState = ViewletStates.getState(state.uid);
-  const latestPendingUid = latestState.pendingUid;
-  if (latestPendingUid !== instanceUid) {
-    return {
-      commands: [],
-      newState: state
-    };
-  }
-  if (!ViewletStates.hasInstance(instanceUid)) {
-    return {
-      commands,
-      newState: state
-    };
-  }
+  object(options);
+
+  // TODO
   return {
-    commands,
-    newState: {
-      ...state,
-      groups: newGroups,
-      tabsUid
-    }
+    ...state
   };
 };
 
@@ -1607,10 +1392,17 @@ const renderEditor = tab => {
   }, text(tab.content || '')];
 };
 
-const renderTab = (tab, isActive) => {
+const HandleClick = 11;
+const HandleClickClose = 12;
+const HandleClickTab = 13;
+
+const renderTab = (tab, isActive, tabIndex, groupIndex) => {
   return [{
     childCount: 2,
-    className: isActive ? 'MainTab MainTabActive' : 'MainTab',
+    className: isActive ? 'MainTab MainTabSelected' : 'MainTab',
+    'data-group-index': groupIndex,
+    'data-index': tabIndex,
+    onClick: HandleClickTab,
     type: Div
   }, {
     childCount: 1,
@@ -1619,25 +1411,26 @@ const renderTab = (tab, isActive) => {
   }, text(tab.isDirty ? `*${tab.title}` : tab.title), {
     childCount: 1,
     className: 'EditorTabCloseButton',
+    onClick: HandleClickClose,
     type: Button
   }, text('×')];
 };
 
-const renderTabBar = group => {
+const renderTabBar = (group, groupIndex) => {
   return [{
     childCount: group.tabs.length,
     className: 'MainTabs',
     type: Div
-  }, ...group.tabs.flatMap(tab => renderTab(tab, tab.id === group.activeTabId))];
+  }, ...group.tabs.flatMap((tab, tabIndex) => renderTab(tab, tab.id === group.activeTabId, tabIndex, groupIndex))];
 };
 
-const renderEditorGroup = group => {
+const renderEditorGroup = (group, groupIndex) => {
   const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
   return [{
     childCount: 2,
     className: 'EditorGroup',
     type: Div
-  }, ...renderTabBar(group), {
+  }, ...renderTabBar(group, groupIndex), {
     childCount: activeTab ? 1 : 1,
     className: 'EditorContainer',
     type: Div
@@ -1653,7 +1446,7 @@ const getMainAreaVirtualDom = layout => {
     childCount: layout.groups.length,
     className: CSS_CLASSES.EDITOR_GROUPS_CONTAINER,
     type: Div
-  }, ...layout.groups.flatMap(renderEditorGroup)];
+  }, ...layout.groups.flatMap((group, groupIndex) => renderEditorGroup(group, groupIndex))];
 };
 
 const renderItems = (oldState, newState) => {
@@ -1696,16 +1489,16 @@ const render2 = (uid, diffResult) => {
   return commands;
 };
 
-const HandleClick = 11;
-const HandleClickClose = 12;
-
 const renderEventListeners = () => {
   return [{
     name: HandleClick,
     params: ['handleClick', TargetName]
   }, {
     name: HandleClickClose,
-    params: ['handleClickClose', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
+    params: ['handleClickCloseTab', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
+  }, {
+    name: HandleClickTab,
+    params: ['handleClickTab', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
   }];
 };
 
@@ -1733,11 +1526,12 @@ const saveState = uid => {
 };
 
 const commandMap = {
-  'MainArea.create': create$1,
+  'MainArea.create': create,
   'MainArea.diff2': diff2,
   'MainArea.getCommandIds': getCommandIds,
   'MainArea.handleClick': wrapCommand(handleClick),
   'MainArea.handleClickCloseTab': wrapCommand(handleClickCloseTab),
+  'MainArea.handleClickTab': wrapCommand(handleClickTab),
   'MainArea.initialize': initialize,
   'MainArea.loadContent': wrapCommand(loadContent),
   'MainArea.openUri': wrapCommand(openUri),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-area-worker",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",