@lvce-editor/find-widget-worker 1.2.0 → 1.4.0

package/dist/findWidgetWorkerMain.js

@@ -906,11 +906,11 @@ const isEqual$3 = (oldState, newState) => {
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return oldState.version === newState.version;
+  return oldState.focused === newState.focused;
 };
 
 const isEqual$1 = (oldState, newState) => {
-  return oldState.version === newState.version;
+  return oldState.version === newState.version && oldState.replaceExpanded === newState.replaceExpanded && oldState.matchCount === newState.matchCount && oldState.matchIndex === newState.matchIndex;
 };
 
 const isEqual = (oldState, newState) => {
@@ -922,9 +922,10 @@ const RenderEventListeners = 11;
 const RenderUid = 12;
 const RenderContent = 13;
 const RenderFocusContext = 14;
+const RenderFocus = 15;
 
-const modules = [isEqual$3, isEqual$1, isEqual$4, isEqual, isEqual$2];
-const numbers = [RenderEventListeners, RenderContent, RenderBounds, RenderUid, RenderFocusContext];
+const modules = [isEqual$3, isEqual$1, isEqual$4, isEqual, isEqual$2, isEqual$2];
+const numbers = [RenderEventListeners, RenderContent, RenderBounds, RenderUid, RenderFocusContext, RenderFocus];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1012,6 +1013,11 @@ const handleBlur = async state => {
   };
 };
 
+const handleClickClose = state => {
+  // TODO ask editor worker to dispose widget
+  return state;
+};
+
 const findRegexMatches = (lines, regex) => {
   if (!regex.global) {
     throw new Error('regex must be global');
@@ -1082,6 +1088,26 @@ const handleInput = (state, value) => {
   return refresh(state, value);
 };
 
+const getFindWidgetHeight = replaceExpanded => {
+  const collapsedHeight = 30;
+  const expandedHeight = 60;
+  const newHeight = replaceExpanded ? expandedHeight : collapsedHeight;
+  return newHeight;
+};
+
+const toggleReplace = state => {
+  const {
+    replaceExpanded
+  } = state;
+  const newExpanded = !replaceExpanded;
+  const newHeight = getFindWidgetHeight(newExpanded);
+  return {
+    ...state,
+    replaceExpanded: newExpanded,
+    height: newHeight
+  };
+};
+
 const commandIds = ['handleSliderPointerDown', 'handleSliderPointerMove'];
 
 const getCommandIds = () => {
@@ -1196,7 +1222,10 @@ const loadContent = async state => {
     x,
     y,
     width,
-    height
+    height,
+    lines,
+    selections,
+    focused: true
   };
 };
 
@@ -1216,14 +1245,19 @@ const renderBounds = (oldState, newState) => {
   return [SetBounds, uid, x, y, width, height];
 };
 
+const HandleBlur = 'handleBlur';
 const HandleClickClose = 'handleClickClose';
+const HandleClickFocusPreviousMatch = 'handleClickFocusPreviousMatch';
 const HandleClickNextMatch = 'handleClickNextMatch';
 const HandleClickPreviousMatch = 'handleClickPreviousMatch';
 const HandleClickReplace = 'handleClickReplace';
+const HandleClickToggleReplace = 'handleClickToggleReplace';
 const HandleClickReplaceAll = 'handleClickReplaceAll';
 const HandleFocus = 'handleFocus';
 const HandleInput = 'handleInput';
 const HandleReplaceFocus = 'handleReplaceFocus';
+const HandleFocusPrevious = 'handleFocusPrevious';
+const HandleFocusNext = 'handleFocusNext';
 const HandleReplaceInput = 'handleReplaceInput';
 
 const emptyObject = {};
@@ -1557,18 +1591,66 @@ const renderContent = (oldState, newState) => {
   return [SetDom2, uid, dom];
 };
 
-const getEventListeners = uid => {
-  return [];
+const getEventListeners = (uid, widgetId) => {
+  return [{
+    name: HandleInput,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleInput', 0, widgetId, 'event.target.value']
+  }, {
+    name: HandleClickClose,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickClose', 0, widgetId]
+  }, {
+    name: HandleClickFocusPreviousMatch,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickPreviousMatch', 0, widgetId]
+  }, {
+    name: HandleClickNextMatch,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickNextMatch', 0, widgetId]
+  }, {
+    name: HandleClickReplace,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickReplace', 0, widgetId]
+  }, {
+    name: HandleClickReplace,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickReplaceAll', 0, widgetId]
+  }, {
+    name: HandleClickToggleReplace,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.toggleReplace', 0, widgetId]
+  }, {
+    name: HandleBlur,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleBlur', 0, widgetId]
+  }, {
+    name: HandleReplaceInput,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleReplaceInput', 0, widgetId]
+  }, {
+    name: HandleReplaceFocus,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleReplaceFocus', 0, widgetId]
+  }, {
+    name: HandleFocusPrevious,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleFocusPrevious', 0, widgetId]
+  }, {
+    name: HandleFocusNext,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleFocusNext', 0, widgetId]
+  }, {
+    name: HandleClickReplaceAll,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickReplaceAll', 0, widgetId]
+  }];
 };
 
+const Find = 5;
+
 const renderEventListeners = state => {
   const {
     uid
   } = state;
-  const eventListeners = getEventListeners();
+  const eventListeners = getEventListeners(uid, Find);
   return [SetEventListeners, uid, eventListeners];
 };
 
+const renderFocus = (oldState, newState) => {
+  const {
+    uid
+  } = newState;
+  return [/* method */'Viewlet.focusSelector', uid, `[name="search-value"]`];
+};
+
 const FocusFindWidget = 16;
 
 const renderFocusContext = (oldState, newState) => {
@@ -1595,6 +1677,8 @@ const getRenderer = diffType => {
       return renderUid;
     case RenderFocusContext:
       return renderFocusContext;
+    case RenderFocus:
+      return renderFocus;
     default:
       throw new Error('unknown renderer');
   }
@@ -1626,17 +1710,19 @@ const terminate = () => {
 const commandMap = {
   'FindWidget.create': create$1,
   'FindWidget.diff2': diff2,
-  'FindWidget.focusFirst': focusFirst,
-  'FindWidget.focusIndex': focusIndex,
-  'FindWidget.focusLast': focusLast,
-  'FindWidget.focusNext': focusNext,
-  'FindWidget.focusPrevious': focusPrevious,
+  'FindWidget.focusFirst': wrapCommand(focusFirst),
+  'FindWidget.focusIndex': wrapCommand(focusIndex),
+  'FindWidget.focusLast': wrapCommand(focusLast),
+  'FindWidget.focusNext': wrapCommand(focusNext),
+  'FindWidget.focusPrevious': wrapCommand(focusPrevious),
   'FindWidget.getCommandIds': getCommandIds,
-  'FindWidget.handleBlur': handleBlur,
-  'FindWidget.handleInput': handleInput,
+  'FindWidget.handleBlur': wrapCommand(handleBlur),
+  'FindWidget.handleClickClose': wrapCommand(handleClickClose),
+  'FindWidget.handleInput': wrapCommand(handleInput),
   'FindWidget.loadContent': wrapCommand(loadContent),
   'FindWidget.render2': render2,
-  'FindWidget.terminate': terminate
+  'FindWidget.terminate': terminate,
+  'FindWidget.toggleReplace': wrapCommand(toggleReplace)
 };
 
 const listen = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/find-widget-worker",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "Web Worker for the find widget in Lvce Editor",
   "repository": {
     "type": "git",