Pass crdtMode properly

raimohanska · Feb 25, 2024 · 49d2a40 · 49d2a40
1 parent 94801e3
commit 49d2a40
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 12 deletions.
diff --git a/common/src/board-reducer.ts b/common/src/board-reducer.ts
@@ -147,9 +147,6 @@ export function boardReducer(
  board.items,
  (items) => {
  event.items.forEach((item) => {
- if (board.crdt && isTextItem(item)) {
- item = { ...item, crdt: board.crdt }
- }
  if (
  item.containerId &&
  !findItem(board)(item.containerId) &&

diff --git a/common/src/domain.ts b/common/src/domain.ts
@@ -405,6 +405,7 @@ export function newSimilarNote(note: Note) {
 }
 
 export function newText(
+ crdt: CrdtMode,
  text: string = "HELLO",
  x: number = 20,
  y: number = 20,
@@ -423,10 +424,12 @@ export function newText(
  z,
  color: "none",
  locked: false,
+ crdt,
  }
 }
 
 export function newContainer(
+ crdt: CrdtMode,
  x: number = 20,
  y: number = 20,
  width: number = 30,
@@ -444,6 +447,7 @@ export function newContainer(
  z,
  color: "white",
  locked: false,
+ crdt,
  }
 }
 

diff --git a/frontend/src/board/item-create.ts b/frontend/src/board/item-create.ts
@@ -12,8 +12,8 @@ export function itemCreateHandler(
  onAdd: (item: Item) => void,
 ) {
  installKeyboardShortcut(plainKey("n"), () => onAdd(newSimilarNote(latestNote.get())))
- installKeyboardShortcut(plainKey("a"), () => onAdd(newContainer()))
- installKeyboardShortcut(plainKey("t"), () => onAdd(newText()))
+ installKeyboardShortcut(plainKey("a"), () => onAdd(newContainer(board.get().crdt)))
+ installKeyboardShortcut(plainKey("t"), () => onAdd(newText(board.get().crdt)))
 
  installDoubleClickHandler((e) => {
  shouldCreateOnDblClick(e) && onAdd(newSimilarNote(latestNote.get()))

diff --git a/frontend/src/board/item-cut-copy-paste.ts b/frontend/src/board/item-cut-copy-paste.ts
@@ -201,7 +201,7 @@ export function cutCopyPasteHandler(
  const currentCenter = coordinateHelper.currentBoardCoordinates.get()
  let toCreate
  if (sanitized.length > 50) {
- toCreate = [newText(sanitized, currentCenter.x, currentCenter.y)]
+ toCreate = [newText(board.get().crdt, sanitized, currentCenter.x, currentCenter.y)]
  } else {
  toCreate = [newNote(sanitized, DEFAULT_NOTE_COLOR, currentCenter.x, currentCenter.y)]
  }

diff --git a/frontend/src/board/toolbars/MainToolBar.tsx b/frontend/src/board/toolbars/MainToolBar.tsx
@@ -110,7 +110,7 @@ export const MainToolBar = ({
  onTouchMove={onTouchMove}
  onTouchStart={onTouchStart}
  >
- <PaletteView {...{ latestNote, addItem: onAdd, focus, tool: toolController.tool }} />
+ <PaletteView {...{ latestNote, addItem: onAdd, focus, tool: toolController.tool, board }} />
  <ToolSelector {...{ toolController }} />
  <DeleteIcon {...{ focus, dispatch, board }} />
  <DuplicateIcon {...{ focus, dispatch, board, crdtStore: boardStore.crdtStore }} />

diff --git a/frontend/src/board/toolbars/PaletteView.tsx b/frontend/src/board/toolbars/PaletteView.tsx
@@ -1,6 +1,6 @@
 import { h, Fragment, HarmajaChild } from "harmaja"
 import * as L from "lonna"
-import { Item, newContainer, newSimilarNote, newText, Note } from "../../../../common/src/domain"
+import { Board, Item, newContainer, newSimilarNote, newText, Note } from "../../../../common/src/domain"
 import { BoardFocus } from "../board-focus"
 import { Tool } from "../tool-selection"
 
@@ -9,17 +9,19 @@ export const PaletteView = ({
  addItem,
  focus,
  tool,
+ board,
 }: {
  latestNote: L.Property<Note>
  addItem: (item: Item) => void
  focus: L.Atom<BoardFocus>
  tool: L.Atom<Tool>
+ board: L.Property<Board>
 }) => {
  return (
  <>
  <NewNote {...{ addItem, latestNote, focus, tool }} />
- <NewContainer {...{ addItem, focus, tool }} />
- <NewText {...{ addItem, focus, tool }} />
+ <NewContainer {...{ addItem, focus, tool, board }} />
+ <NewText {...{ addItem, focus, tool, board }} />
  </>
  )
 }
@@ -28,10 +30,12 @@ export const NewText = ({
  addItem: onAdd,
  focus,
  tool,
+ board,
 }: {
  addItem: (i: Item) => void
  focus: L.Atom<BoardFocus>
  tool: L.Atom<Tool>
+ board: L.Property<Board>
 }) => {
  const svg = () => (
  <svg viewBox="0 0 44 49" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -53,7 +57,7 @@ export const NewText = ({
  tooltip="Drag to add new text area"
  svg={svg}
  focus={focus}
- createItem={newText}
+ createItem={() => newText(board.get().crdt)}
  addItem={onAdd}
  tool={tool}
  />
@@ -116,10 +120,12 @@ export const NewContainer = ({
  addItem: onAdd,
  focus,
  tool,
+ board,
 }: {
  addItem: (i: Item) => void
  focus: L.Atom<BoardFocus>
  tool: L.Atom<Tool>
+ board: L.Property<Board>
 }) => {
  const svg = () => (
  <svg viewBox="0 0 44 49" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -142,7 +148,7 @@ export const NewContainer = ({
  tooltip="Drag to add new area for organizing items"
  svg={svg}
  focus={focus}
- createItem={newContainer}
+ createItem={() => newContainer(board.get().crdt)}
  addItem={onAdd}
  tool={tool}
  />