@lvce-editor/problems-view 1.6.0 → 1.8.0

package/dist/problemsViewWorkerMain.js

@@ -1050,14 +1050,19 @@ const create = (id, uri, x, y, width, height, args, parentUid) => {
   set(id, state, state);
 };
 
+const isEqual$1 = (oldState, newState) => {
+  return newState.inputSource === User || oldState.filterValue === newState.filterValue;
+};
+
 const isEqual = (oldState, newState) => {
-  return oldState.problems === newState.problems;
+  return oldState.problems === newState.problems && oldState.filterValue === newState.filterValue;
 };
 
 const RenderItems = 1;
+const RenderFilterValue = 2;
 
-const modules = [isEqual];
-const numbers = [RenderItems];
+const modules = [isEqual, isEqual$1];
+const numbers = [RenderItems, RenderFilterValue];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1310,6 +1315,14 @@ const handleContextMenu = async (state, eventX, eventY) => {
   return state;
 };
 
+const handleFilterInput = (state, value, inputSource = Script) => {
+  return {
+    ...state,
+    filterValue: value,
+    inputSource
+  };
+};
+
 const handleIconThemeChange = state => {
   return {
     ...state,
@@ -1445,12 +1458,18 @@ const loadContent = async (state, savedState) => {
   };
 };
 
+const Filter$2 = 'filter';
+
+const renderFilterValue = (oldState, newState) => {
+  return ['Viewlet.setValueByName', Filter$2, newState.filterValue];
+};
+
 const Button = 1;
 const ProblemsFilter = 4;
 
 const Chevron = 'Chevron';
 const FileIcon = 'FileIcon';
-const Filter$2 = 'Filter';
+const Filter$1 = 'Filter';
 const FilterBadge = 'FilterBadge';
 const Highlight = 'Highlight';
 const IconButton = 'IconButton';
@@ -1520,8 +1539,6 @@ const getInputBoxVirtualDom = (name, onInput, placeholder) => {
   };
 };
 
-const Filter$1 = 'filter';
-
 const CollapseAll = 'CollapseAll';
 const Filter = 'Filter';
 const ListFlat = 'ListFlat';
@@ -1549,9 +1566,9 @@ const getBadgeDom = badgeText => {
 const getProblemsFilterVirtualDom = action => {
   return [{
     type: VirtualDomElements.Div,
-    className: Filter$2,
+    className: Filter$1,
     childCount: getChildCount(action.badgeText)
-  }, getInputBoxVirtualDom(Filter$1, action.command, action.placeholder || ''), ...getBadgeDom(action.badgeText), ...getActionButtonVirtualDom({
+  }, getInputBoxVirtualDom(Filter$2, action.command, action.placeholder || ''), ...getBadgeDom(action.badgeText), ...getActionButtonVirtualDom({
     id: 'more filters',
     // TODO use i18n string
     icon: Filter,
@@ -1966,6 +1983,8 @@ const getRenderer = diffType => {
   switch (diffType) {
     case RenderItems:
       return renderItems;
+    case RenderFilterValue:
+      return renderFilterValue;
     default:
       throw new Error('unknown renderer');
   }
@@ -2011,9 +2030,19 @@ const getActionsVirtualDom = actions => {
 };
 
 const getActions = state => {
-  const visibleCount = getVisibleProblems(state.problems, state.collapsedUris, state.focusedIndex, state.filterValue).length;
-  const problemsCount = state.problems.length;
-  const isSmall = state.width <= state.smallWidthBreakPoint;
+  const {
+    problems,
+    width,
+    collapsedUris,
+    focusedIndex,
+    smallWidthBreakPoint,
+    filterValue,
+    inputSource,
+    viewMode
+  } = state;
+  const visibleCount = getVisibleProblems(problems, collapsedUris, focusedIndex, filterValue).length;
+  const problemsCount = problems.length;
+  const isSmall = width <= smallWidthBreakPoint;
   const actions = [];
   if (!isSmall) {
     actions.push({
@@ -2022,10 +2051,10 @@ const getActions = state => {
       command: HandleFilterInput,
       badgeText: visibleCount === problemsCount ? '' : showingOf(visibleCount, problemsCount),
       placeholder: filter(),
-      value: state.inputSource === Script ? state.filterValue : ''
+      value: inputSource === Script ? filterValue : ''
     });
   }
-  if (state.viewMode === Table) {
+  if (viewMode === Table) {
     actions.push({
       type: Button,
       id: viewAsList$1(),
@@ -2067,10 +2096,14 @@ const renderEventListeners = () => {
     preventDefault: true
   }, {
     name: HandleFilterInput,
-    params: ['handleFilterInput', 'event.target.value']
+    // @ts-ignore
+    params: ['handleFilterInput', 'event.target.value', User]
   }, {
     name: HandleClearFilterClick,
     params: ['clearFilter']
+  }, {
+    name: HandlePointerDown,
+    params: ['handleClickAt', 'event.clientX', 'event.clientY']
   }];
 };
 
@@ -2110,26 +2143,27 @@ const viewAsTable = state => {
 
 const commandMap = {
   'Problems.copyMessage': copyMessage,
-  'Problems.renderEventListeners': renderEventListeners,
   'Problems.create': create,
   'Problems.diff2': diff2,
   'Problems.focusIndex': focusIndex,
+  'Problems.getCommandIds': getCommandIds,
   'Problems.getKeyBindings': getKeyBindings,
   'Problems.handleArrowLeft': wrapCommand(handleArrowLeft),
   'Problems.handleArrowRight': wrapCommand(handleArrowRight),
+  'Problems.handleClickAt': wrapCommand(handleClickAt),
+  'Problems.handleContextMenu': handleContextMenu,
+  'Problems.handleFilterInput': wrapCommand(handleFilterInput),
+  'Problems.handleIconThemeChange': handleIconThemeChange,
   'Problems.initialize': initialize,
   'Problems.loadContent': wrapCommand(loadContent),
   'Problems.render2': render2,
   'Problems.renderActions': renderActions,
+  'Problems.renderEventListeners': renderEventListeners,
   'Problems.resize': resize,
   'Problems.saveState': saveState,
   'Problems.terminate': terminate,
-  'Problems.handleIconThemeChange': handleIconThemeChange,
-  'Problems.handleContextMenu': handleContextMenu,
-  'Problems.viewAsTable': viewAsTable,
   'Problems.viewAsList': viewAsList,
-  'Problems.handleClickAt': wrapCommand(handleClickAt),
-  'Problems.getCommandIds': getCommandIds
+  'Problems.viewAsTable': viewAsTable
 };
 
 const listen = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/problems-view",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "description": "Problems View Worker",
   "repository": {
     "type": "git",