From 61535ed41f62653efbd966fbf3d15d0632e0eb44 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Fri, 16 Jun 2023 01:11:02 -0400 Subject: [PATCH] Update toggle, add tests --- styles/src/element/index.ts | 3 +- styles/src/element/toggle.test.ts | 52 +++++++++++++++++++++ styles/src/element/toggle.ts | 4 +- styles/src/styleTree/commandPalette.ts | 3 +- styles/src/styleTree/contactList.ts | 3 +- styles/src/styleTree/contextMenu.ts | 3 +- styles/src/styleTree/editor.ts | 3 +- styles/src/styleTree/picker.ts | 3 +- styles/src/styleTree/projectPanel.ts | 3 +- styles/src/styleTree/search.ts | 3 +- styles/src/styleTree/statusBar.ts | 3 +- styles/src/styleTree/tabBar.ts | 3 +- styles/src/styleTree/toolbarDropdownMenu.ts | 3 +- styles/src/styleTree/workspace.ts | 2 +- 14 files changed, 67 insertions(+), 24 deletions(-) create mode 100644 styles/src/element/toggle.test.ts diff --git a/styles/src/element/index.ts b/styles/src/element/index.ts index ad58b89e0e8217fc511d76183453b570a496fb39..b1e3cfe415f402ff1ca45ca97addda32ac1bf0ca 100644 --- a/styles/src/element/index.ts +++ b/styles/src/element/index.ts @@ -1,3 +1,4 @@ import { interactive } from "./interactive" +import { toggleable } from "./toggle" -export { interactive } +export { interactive, toggleable } diff --git a/styles/src/element/toggle.test.ts b/styles/src/element/toggle.test.ts new file mode 100644 index 0000000000000000000000000000000000000000..8018ce10393fb6145f7214e0deb9620f2b627181 --- /dev/null +++ b/styles/src/element/toggle.test.ts @@ -0,0 +1,52 @@ +import { + NO_ACTIVE_ERROR, + NO_INACTIVE_OR_BASE_ERROR, + toggleable, +} from "./toggle" +import { describe, it, expect } from "vitest" + +describe("toggleable", () => { + it("creates a Toggleable with base properties and states", () => { + const result = toggleable({ + base: { background: "#000000", color: "#CCCCCC" }, + state: { + active: { color: "#FFFFFF" }, + }, + }) + + expect(result).toEqual({ + inactive: { background: "#000000", color: "#CCCCCC" }, + active: { background: "#000000", color: "#FFFFFF" }, + }) + }) + + it("creates a Toggleable with no base properties", () => { + const result = toggleable({ + state: { + inactive: { background: "#000000", color: "#CCCCCC" }, + active: { background: "#000000", color: "#FFFFFF" }, + }, + }) + + expect(result).toEqual({ + inactive: { background: "#000000", color: "#CCCCCC" }, + active: { background: "#000000", color: "#FFFFFF" }, + }) + }) + + it("throws error when both inactive and base are missing", () => { + const state = { + active: { background: "#000000", color: "#FFFFFF" }, + } + + expect(() => toggleable({ state })).toThrow(NO_INACTIVE_OR_BASE_ERROR) + }) + + it("throws error when no active state is present", () => { + const state = { + inactive: { background: "#000000", color: "#CCCCCC" }, + } + + expect(() => toggleable({ state })).toThrow(NO_ACTIVE_ERROR) + }) +}) diff --git a/styles/src/element/toggle.ts b/styles/src/element/toggle.ts index 2b6858e15be6c3db85232371ba38e0bc9127ea33..84390810c0dec5877c55a9effea75afa74d2e119 100644 --- a/styles/src/element/toggle.ts +++ b/styles/src/element/toggle.ts @@ -4,9 +4,9 @@ type ToggleState = "inactive" | "active" type Toggleable = Record -const NO_INACTIVE_OR_BASE_ERROR = +export const NO_INACTIVE_OR_BASE_ERROR = "A toggleable object must have an inactive state, or a base property." -const NO_ACTIVE_ERROR = "A toggleable object must have an active state." +export const NO_ACTIVE_ERROR = "A toggleable object must have an active state." interface ToggleableProps { base?: T diff --git a/styles/src/styleTree/commandPalette.ts b/styles/src/styleTree/commandPalette.ts index ae0aae2f81aee160fb6e094e005fd380f052ef89..59e12945db864c1d486bfb68fb6dc349b6165ce6 100644 --- a/styles/src/styleTree/commandPalette.ts +++ b/styles/src/styleTree/commandPalette.ts @@ -1,8 +1,7 @@ import { ColorScheme } from "../theme/colorScheme" import { withOpacity } from "../theme/color" import { text, background } from "./components" -import { toggleable } from "./toggle" -import { interactive } from "../element" +import { interactive, toggleable } from "../element" export default function commandPalette(colorScheme: ColorScheme) { let layer = colorScheme.highest diff --git a/styles/src/styleTree/contactList.ts b/styles/src/styleTree/contactList.ts index 5c6068408ecb0f06615a52f367520b0783fd5c21..2ac17a4584c222c477709b03fb4a512e8df2093a 100644 --- a/styles/src/styleTree/contactList.ts +++ b/styles/src/styleTree/contactList.ts @@ -1,7 +1,6 @@ import { ColorScheme } from "../theme/colorScheme" import { background, border, borderColor, foreground, text } from "./components" -import { toggleable } from "./toggle" -import { interactive } from "../element" +import { interactive, toggleable } from "../element" export default function contactsPanel(colorScheme: ColorScheme) { const nameMargin = 8 const sidePadding = 12 diff --git a/styles/src/styleTree/contextMenu.ts b/styles/src/styleTree/contextMenu.ts index 6f5eb5364058aa9b790c9b58f36bae8681385452..90ba0ce5b532a60deee752e55ea14c5e70c4c4d0 100644 --- a/styles/src/styleTree/contextMenu.ts +++ b/styles/src/styleTree/contextMenu.ts @@ -1,7 +1,6 @@ import { ColorScheme } from "../theme/colorScheme" import { background, border, borderColor, text } from "./components" -import { interactive } from "../element" -import { toggleable } from "./toggle" +import { interactive, toggleable } from "../element" export default function contextMenu(colorScheme: ColorScheme) { let layer = colorScheme.middle diff --git a/styles/src/styleTree/editor.ts b/styles/src/styleTree/editor.ts index 9dec64b0ced6218f41043bd48b7758d4fb54de51..e029a724a39e926473c193d3601d766259ddf12d 100644 --- a/styles/src/styleTree/editor.ts +++ b/styles/src/styleTree/editor.ts @@ -4,8 +4,7 @@ import { background, border, borderColor, foreground, text } from "./components" import hoverPopover from "./hoverPopover" import { buildSyntax } from "../theme/syntax" -import { interactive } from "../element" -import { toggleable } from "./toggle" +import { interactive, toggleable } from "../element" export default function editor(colorScheme: ColorScheme) { const { isLight } = colorScheme diff --git a/styles/src/styleTree/picker.ts b/styles/src/styleTree/picker.ts index 7730395ec9653f7661eae91eeee2f1703c4486a7..12fecfa6f89b43bfad580b3594e0804e24d16a67 100644 --- a/styles/src/styleTree/picker.ts +++ b/styles/src/styleTree/picker.ts @@ -1,8 +1,7 @@ import { ColorScheme } from "../theme/colorScheme" import { withOpacity } from "../theme/color" import { background, border, text } from "./components" -import { toggleable } from "./toggle" -import { interactive } from "../element" +import { interactive, toggleable } from "../element" export default function picker(colorScheme: ColorScheme): any { let layer = colorScheme.lowest diff --git a/styles/src/styleTree/projectPanel.ts b/styles/src/styleTree/projectPanel.ts index 23df2fbf58f60ada4cd9b36542e71728a398fca0..5f283e551dcaa5181da1dbc9563ad8cf5aca7250 100644 --- a/styles/src/styleTree/projectPanel.ts +++ b/styles/src/styleTree/projectPanel.ts @@ -1,8 +1,7 @@ import { ColorScheme } from "../theme/colorScheme" import { withOpacity } from "../theme/color" import { background, border, foreground, text } from "./components" -import { interactive } from "../element" -import { toggleable } from "./toggle" +import { interactive, toggleable } from "../element" export default function projectPanel(colorScheme: ColorScheme) { const { isLight } = colorScheme diff --git a/styles/src/styleTree/search.ts b/styles/src/styleTree/search.ts index a95296971c1af14156f25f9e68d9e21e74e7a173..4b0869f10e626d71072d1401389947cc999c639d 100644 --- a/styles/src/styleTree/search.ts +++ b/styles/src/styleTree/search.ts @@ -1,8 +1,7 @@ import { ColorScheme } from "../theme/colorScheme" import { withOpacity } from "../theme/color" import { background, border, foreground, text } from "./components" -import { interactive } from "../element" -import { toggleable } from "./toggle" +import { interactive, toggleable } from "../element" export default function search(colorScheme: ColorScheme) { let layer = colorScheme.highest diff --git a/styles/src/styleTree/statusBar.ts b/styles/src/styleTree/statusBar.ts index 8a91b7eaac434ac4b2c160320ee4ea22220ab956..d6d7eda732ce3bb4435f9dc01fc16eb11bff2862 100644 --- a/styles/src/styleTree/statusBar.ts +++ b/styles/src/styleTree/statusBar.ts @@ -1,7 +1,6 @@ import { ColorScheme } from "../theme/colorScheme" import { background, border, foreground, text } from "./components" -import { interactive } from "../element" -import { toggleable } from "./toggle" +import { interactive, toggleable } from "../element" export default function statusBar(colorScheme: ColorScheme) { let layer = colorScheme.lowest diff --git a/styles/src/styleTree/tabBar.ts b/styles/src/styleTree/tabBar.ts index c2b5de02159f34b9066594249dbbfdc1e1e270ca..e00f0b8b83cdeae9dcbffaae967842288f327377 100644 --- a/styles/src/styleTree/tabBar.ts +++ b/styles/src/styleTree/tabBar.ts @@ -1,8 +1,7 @@ import { ColorScheme } from "../theme/colorScheme" import { withOpacity } from "../theme/color" import { text, border, background, foreground } from "./components" -import { toggleable } from "./toggle" -import { interactive } from "../element" +import { interactive, toggleable } from "../element" export default function tabBar(colorScheme: ColorScheme) { const height = 32 diff --git a/styles/src/styleTree/toolbarDropdownMenu.ts b/styles/src/styleTree/toolbarDropdownMenu.ts index 1f47c85f4e7563b50577619e5747add669867c94..3ce7ca7d7cda23b4300c22baf38e3de28c6372fc 100644 --- a/styles/src/styleTree/toolbarDropdownMenu.ts +++ b/styles/src/styleTree/toolbarDropdownMenu.ts @@ -1,7 +1,6 @@ import { ColorScheme } from "../theme/colorScheme" import { background, border, text } from "./components" -import { interactive } from "../element" -import { toggleable } from "./toggle" +import { interactive, toggleable } from "../element" export default function dropdownMenu(colorScheme: ColorScheme) { let layer = colorScheme.middle diff --git a/styles/src/styleTree/workspace.ts b/styles/src/styleTree/workspace.ts index 79e7830aec8e1ad46127516c33cb74892ad17943..a2a21eaff4a88df354c41870118363befd12953f 100644 --- a/styles/src/styleTree/workspace.ts +++ b/styles/src/styleTree/workspace.ts @@ -1,6 +1,6 @@ import { ColorScheme } from "../theme/colorScheme" import { withOpacity } from "../theme/color" -import { toggleable } from "./toggle" +import { toggleable } from "../element" import { background, border,