@lvce-editor/find-widget-worker 1.1.0 → 1.3.0

package/dist/findWidgetWorkerMain.js

@@ -887,7 +887,11 @@ const create$1 = (uid, x, y, width, height, parentUid) => {
     focus: 0,
     version: 0,
     lines: [],
-    selections: []
+    selections: [],
+    editorX: x,
+    editorY: y,
+    editorWidth: width,
+    editorHeight: height
   };
   set$1(uid, state, state);
   return state;
@@ -906,7 +910,7 @@ const isEqual$2 = (oldState, newState) => {
 };
 
 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) => {
@@ -1008,6 +1012,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');
@@ -1078,12 +1087,44 @@ 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 newExpanded = !state.replaceExpanded;
+  const newHeight = getFindWidgetHeight(newExpanded);
+  return {
+    ...state,
+    replaceExpanded: !state.replaceExpanded,
+    height: newHeight
+  };
+};
+
 const commandIds = ['handleSliderPointerDown', 'handleSliderPointerMove'];
 
 const getCommandIds = () => {
   return commandIds;
 };
 
+const getFindWidgetPosition = (editorX, editorY, editorWidth) => {
+  const width = 300;
+  const height = 30;
+  const paddingTop = 10;
+  const paddingRight = 20;
+  const x = editorX + editorWidth - width - paddingRight;
+  const y = editorY + paddingTop;
+  return {
+    y,
+    x,
+    width,
+    height
+  };
+};
+
 const rpcs = Object.create(null);
 const set$a = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1144,10 +1185,19 @@ const getSelections = async editorUid => {
 
 const loadContent = async state => {
   const {
-    editorUid
+    editorUid,
+    editorWidth,
+    editorX,
+    editorY
   } = state;
   const lines = await getLines(editorUid);
   const selections = await getSelections(editorUid);
+  const {
+    x,
+    y,
+    width,
+    height
+  } = getFindWidgetPosition(editorX, editorY, editorWidth);
   if (lines.length === 0) {
     return state;
   }
@@ -1164,7 +1214,11 @@ const loadContent = async state => {
     matches,
     matchIndex: 0,
     matchCount,
-    version: 1
+    version: 1,
+    x,
+    y,
+    width,
+    height
   };
 };
 
@@ -1184,14 +1238,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 = {};
@@ -1525,15 +1584,56 @@ 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];
 };
 
@@ -1601,10 +1701,12 @@ const commandMap = {
   'FindWidget.focusPrevious': focusPrevious,
   'FindWidget.getCommandIds': getCommandIds,
   'FindWidget.handleBlur': handleBlur,
+  'FindWidget.handleClickClose': handleClickClose,
   'FindWidget.handleInput': handleInput,
   'FindWidget.loadContent': wrapCommand(loadContent),
   'FindWidget.render2': render2,
-  'FindWidget.terminate': terminate
+  'FindWidget.terminate': terminate,
+  'FindWidget.toggleReplace': toggleReplace
 };
 
 const listen = async () => {

package/package.json

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