@lvce-editor/extension-detail-view 3.38.0 → 3.39.0

package/dist/extensionDetailViewWorkerMain.js

@@ -646,7 +646,7 @@ const HandleClickUninstall = 'handleClickUninstall';
 const HandleFeaturesClick = 'handleFeaturesClick';
 const HandleIconError = 'handleIconError';
 const HandleReadmeContextMenu = 'handleReadmeContextMenu';
-const HandleReadmeWheel = 'handleReadmeWheel';
+const HandleReadmeScroll = 'handleReadmeScroll';
 const HandleTabsClick = 'handleTabsClick';
 
 const ActivationEvents = 'ActivationEvents';
@@ -784,6 +784,7 @@ const getMarkdownVirtualDom = async (html, options) => {
   const dom = await getVirtualDom(html);
   const newDom = [...dom];
   if (options?.scrollToTopEnabled) {
+    newDom[0].onScroll = HandleReadmeScroll;
     newDom[0].childCount++;
     const extraDom = getScrollToTopVirtualDom();
     newDom.splice(1, 0, ...extraDom);
@@ -2071,6 +2072,7 @@ const {
 
 const create = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
+    uid,
     activationEvents: [],
     assetDir: assetDir || '',
     badge: '',
@@ -2078,6 +2080,7 @@ const create = (uid, uri, x, y, width, height, platform, assetDir) => {
     builtinExtensionsBadgeEnabled: true,
     categories: [],
     changelogVirtualDom: [],
+    changelogScrollTop: 0,
     commands: [],
     description: '',
     detailsVirtualDom: [],
@@ -2111,34 +2114,33 @@ const create = (uid, uri, x, y, width, height, platform, assetDir) => {
     themesMarkdownDom: [],
     uri,
     webViews: [],
-    width
+    width,
+    focus: 0
   };
   set$1(uid, state, state);
 };
 
-const RenderFocus = 2;
-const RenderItems = 3;
-const RenderScrollTop = 4;
-
-const diffType$2 = RenderFocus;
 const isEqual$2 = (oldState, newState) => {
-  return oldState === newState;
+  return oldState.focus === newState.focus;
 };
 
-const diffType$1 = RenderItems;
 const isEqual$1 = (oldState, newState) => {
-  return oldState === newState;
+  return oldState.activationEvents === newState.activationEvents && oldState.badge === newState.badge && oldState.categories === newState.categories && oldState.changelogVirtualDom === newState.changelogVirtualDom && oldState.commands === newState.commands && oldState.description === newState.description && oldState.detailsVirtualDom === newState.detailsVirtualDom && oldState.displaySize === newState.displaySize && oldState.extensionId === newState.extensionId && oldState.extensionVersion === newState.extensionVersion && oldState.jsonValidation === newState.jsonValidation && oldState.selectedFeature === newState.selectedFeature && oldState.selectedTab === newState.selectedTab && oldState.settings === newState.settings && oldState.themesMarkdownDom === newState.themesMarkdownDom && oldState.webViews === newState.webViews;
 };
 
 const User = 1;
+const Script = 2;
 
-const diffType = RenderScrollTop;
 const isEqual = (oldState, newState) => {
-  return newState.scrollSource === User || oldState.readmeScrollTop === newState.readmeScrollTop;
+  return newState.scrollSource === Script || oldState.readmeScrollTop === newState.readmeScrollTop;
 };
 
+const RenderFocus = 2;
+const RenderItems = 3;
+const RenderScrollTop = 4;
+
 const modules = [isEqual$1, isEqual$2, isEqual];
-const numbers = [diffType$1, diffType$2, diffType];
+const numbers = [RenderItems, RenderFocus, RenderScrollTop];
 
 const diff2 = uid => {
   const {
@@ -2812,6 +2814,13 @@ const loadHeaderContent = (state, platform, extension) => {
   };
 };
 
+const getSavedChangelogScrollTop = savedState => {
+  if (savedState && typeof savedState === 'object' && 'changelogScrollTop' in savedState && typeof savedState.changelogScrollTop === 'number') {
+    return savedState.changelogScrollTop;
+  }
+  return 0;
+};
+
 const getSavedReadmeScrollTop = savedState => {
   if (savedState && typeof savedState === 'object' && 'readmeScrollTop' in savedState && typeof savedState.readmeScrollTop === 'number') {
     return savedState.readmeScrollTop;
@@ -2837,10 +2846,12 @@ const restoreState = savedState => {
   const selectedTab = getSavedSelectedTab(savedState);
   const selectedFeature = getSavedSelectedFeature(savedState);
   const readmeScrollTop = getSavedReadmeScrollTop(savedState);
+  const changelogScrollTop = getSavedChangelogScrollTop(savedState);
   return {
     selectedFeature,
     selectedTab,
-    readmeScrollTop
+    readmeScrollTop,
+    changelogScrollTop
   };
 };
 
@@ -3131,16 +3142,11 @@ const getMarketplaceEntries = () => {
   }];
 };
 
-// import * as GetScrollToTopVirtualDom from '../GetScrollToTopVirtualDom/GetScrollToTopVirtualDom.ts'
-
 const getChildCount = (additionalDetails, scrollToTopEnabled) => {
   let count = 1;
   if (additionalDetails) {
     count++;
   }
-  // if (scrollToTopEnabled) {
-  //   count++
-  // }
   return count;
 };
 const getDetailsVirtualDom = (sanitizedReadmeHtml, displaySize, extensionId, extensionVersion, width, extensionUri, scrollToTopButtonEnabled, categories$1, resources$1, showAdditionalDetailsBreakpoint // new parameter, no default
@@ -3158,9 +3164,7 @@ const getDetailsVirtualDom = (sanitizedReadmeHtml, displaySize, extensionId, ext
     className: ExtensionDetailPanel,
     childCount: childCount,
     role: AriaRoles.Panel
-  },
-  // ...GetScrollToTopVirtualDom.getScrollToTopVirtualDom(scrollToTopButtonEnabled),
-  ...sanitizedReadmeHtml, ...getAdditionalDetailsVirtualDom(showAdditionalDetails, firstHeading, entries, secondHeading, secondEntries, thirdHeading, categories$1, fourthHeading, resources$1)];
+  }, ...sanitizedReadmeHtml, ...getAdditionalDetailsVirtualDom(showAdditionalDetails, firstHeading, entries, secondHeading, secondEntries, thirdHeading, categories$1, fourthHeading, resources$1)];
   return dom;
 };
 
@@ -3436,7 +3440,9 @@ const renderFocus = (oldState, newState) => {
 };
 
 const renderScrollTop = (oldState, newState) => {
-  return ['Viewlet.setScrollTop', '', newState.readmeScrollTop];
+  const selector = '.ExtensionDetailPanel .Markdown';
+  const property = 'scrollTop';
+  return ['Viewlet.setProperty', newState.uid, selector, property, newState.readmeScrollTop];
 };
 
 const getRenderer = diffType => {
@@ -3466,7 +3472,7 @@ const render2 = (uid, diffResult) => {
     oldState,
     newState
   } = get(uid);
-  set$1(uid, oldState, newState);
+  set$1(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -3482,8 +3488,9 @@ const renderEventListeners = () => {
     name: HandleReadmeContextMenu,
     params: ['handleReadmeContextMenu', 'event.clientX', 'event.clientY', 'event.target.href', 'event.target.src']
   }, {
-    name: HandleReadmeWheel,
-    params: ['handleWheel', 'event.deltaX', 'event.deltaY']
+    name: HandleReadmeScroll,
+    params: ['handleWheel', 'event.deltaX', 'event.deltaY'],
+    passive: true
   }, {
     name: HandleTabsClick,
     params: ['handleTabsClick', 'event.target.name']
@@ -3498,7 +3505,8 @@ const renderEventListeners = () => {
     params: ['handleClickDisable']
   }, {
     name: HandleClickScrollToTop,
-    params: ['handleClickScrollToTop']
+    params: ['handleClickScrollToTop'],
+    preventDefault: true
   }, {
     name: HandleClickSettings,
     params: ['handleClickSettings']
@@ -3525,12 +3533,14 @@ const saveState = uid => {
   const {
     selectedTab,
     selectedFeature,
-    readmeScrollTop
+    readmeScrollTop,
+    changelogScrollTop
   } = newState;
   return {
     selectedTab,
     selectedFeature,
-    readmeScrollTop
+    readmeScrollTop,
+    changelogScrollTop
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-detail-view",
-  "version": "3.38.0",
+  "version": "3.39.0",
   "description": "Extension Detail View Worker",
   "license": "MIT",
   "author": "Lvce Editor",