Code Refactoring

code/client/dev-dist/sw.js

@@ -82,7 +82,7 @@ define(['./workbox-fda11f75'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.965t3hopnrg"
+    "revision": "0.jepaoi887g"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

code/client/src/editor/hooks/useEvents.ts

@@ -8,6 +8,7 @@ function useEvents(fugue: Fugue, onDone: () => void) {
     switch (operation.type) {
       case 'insert':
         fugue.insertRemote(operation);
+        // TODO: update the style of the added node in slate
         break;
       case 'delete':
         fugue.deleteRemote(operation);

code/client/src/editor/slate.js/SlateEditor.tsx → code/client/src/editor/slate/SlateEditor.tsx

@@ -8,7 +8,6 @@ import Toolbar from '@editor/slate.js/toolbar/Toolbar';
 import { withHistory } from 'slate-history';
 import useEditor from '@editor/slate.js/hooks/useEditor';
 import { withMarkdown } from '@editor/slate.js/plugins/markdown/withMarkdown';
-import { withNormalize } from './plugins/normalize/withNormalize';
 import { toSlate } from '@editor/slate.js/utils/toSlate';
 
 const initialValue = [
@@ -19,7 +18,7 @@ const initialValue = [
 ];
 
 function SlateEditor() {
-  const editor = useEditor(withHistory, withReact, withMarkdown, withNormalize);
+  const editor = useEditor(withHistory, withReact, withMarkdown);
   const fugue = useFugue();
   const { onKeyDown, onPaste, onCut } = useInputHandlers(editor, fugue);
   const { renderElement, renderLeaf } = useRenderers();

code/client/src/editor/slate.js/hooks/useInputHandlers.ts → code/client/src/editor/slate/hooks/useInputHandlers.ts

@@ -18,7 +18,6 @@ function useInputHandlers(editor: Editor, fugue: Fugue) {
 
     const selection = getSelection(editor);
     const { start, end } = selection;
-
     switch (e.key) {
       case 'Enter':
         fugue.insertLocal(start, insertNode('\n', []));
@@ -37,10 +36,9 @@ function useInputHandlers(editor: Editor, fugue: Fugue) {
       default: {
         if (e.key.length !== 1) break;
         if (selection.start.column !== selection.end.column) {
-          // replace selection
-          fugue.deleteLocal(selection);
+          fugue.deleteLocal(selection); // replace selection
         }
-        const previousNode = fugue.getNodeByCursor({ line: start.line, column: start.column - 1 });
+        const previousNode = fugue.getNodeByCursor(start);
         const styles = previousNode?.styles || [];
         fugue.insertLocal(start, insertNode(e.key, styles));
         break;
@@ -71,11 +69,20 @@ function useInputHandlers(editor: Editor, fugue: Fugue) {
   }
 
   function shortcutHandler(event: React.KeyboardEvent<HTMLDivElement>) {
-    const mark = hotkeys[event.key];
-    CustomEditor.toggleMark(editor, mark, fugue);
+    switch (event.key) {
+      case 'z':
+        onUndo();
+        break;
+      case 'y':
+        onRedo();
+        break;
+      default: {
+        const mark = hotkeys[event.key];
+        CustomEditor.toggleMark(editor, mark, fugue);
+      }
+    }
   }
-
-  return { onKeyDown, onPaste, onCut, onUndo, onRedo };
+  return { onKeyDown, onPaste, onCut };
 }
 
 export default useInputHandlers;

code/server/src/controllers/socket.io/onConnection.ts → code/server/src/controllers/websocket/onConnection.ts

@@ -18,7 +18,7 @@ function onConnection(service: DocumentService, events: Record<string, SocketHan
     Object.entries(events).forEach(([event, handler]) => {
       socket.on(event, data => {
         try {
-          // console.log(event);
+          console.log(event, data);
           handler(socket, data);
         } catch (e) {
           socket.emit('error');