fix context menu color setting: it used an outdated snapshot of focus…

…ed items
raimohanska · Feb 18, 2021 · d5ceb9a · d5ceb9a
1 parent 847bbc3
commit d5ceb9a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/cypress/integration/basic.js b/cypress/integration/basic.js
@@ -281,6 +281,7 @@ describe("Board functionality", () => {
         })
 
         NotesWithText("HELLO").click({ force: true })
+        cy.get(".text").contains("HELLO").type("Monoids")
         cy.get(".context-menu").scrollIntoView().should("be.visible")
         cy.get(".colors")
             .find(".color")
@@ -291,7 +292,7 @@ describe("Board functionality", () => {
                 const newColor = templateWithNewColor.style.background
 
                 templateWithNewColor.click()
-                NotesWithText("HELLO").then((els) => {
+                NotesWithText("Monoids").then((els) => {
                     expect(els[0].style.background, `Note 'HELLO' should have turned ${newColor}`).to.equal(newColor)
                 })
             })

diff --git a/frontend/src/board/ContextMenuView.tsx b/frontend/src/board/ContextMenuView.tsx
@@ -18,22 +18,23 @@ export const ContextMenuView = ({
     board: L.Property<Board>
     focus: L.Property<BoardFocus>
 }) => {
-    const focusedItems = L.view(
-        focus,
-        (f) => {
-            switch (f.status) {
-                case "dragging":
-                    return []
-                case "editing":
-                    return [f.id]
-                case "none":
-                    return []
-                case "selected":
-                    return [...f.ids]
-            }
-        },
-        (ids) => ids.map(getItem(board.get())),
-    )
+    function itemIdsForContextMenu(f: BoardFocus) {
+        switch (f.status) {
+            case "dragging":
+                return []
+            case "editing":
+                return [f.id]
+            case "none":
+                return []
+            case "selected":
+                return [...f.ids]
+        }
+    }
+
+    const focusedItems = L.view(focus, board, (f, b) => {
+        const itemIds = itemIdsForContextMenu(f)
+        return itemIds.map(getItem(board.get()))
+    })
 
     const focusItem = L.view(focusedItems, (items) => {
         if (items.length === 0) return null