Skip to content

Add keyboard shortcuts to color palette generator #506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tabletalkstudio wants to merge 4 commits into
base: stage
Choose a base branch
from
Draft

Add keyboard shortcuts to color palette generator #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce151d2
Add Space / arrow-key shortcuts to color palette generator
May 16, 2026
5d236f4
Swap history shortcuts: ArrowLeft/Right → Cmd+Z / Cmd+Shift+Z
May 21, 2026
4750dc8
Support Ctrl+Z / Ctrl+Shift+Z for undo/redo on Windows/Linux
May 22, 2026
51efc64
Extend Cmd/Ctrl+Z undo/redo to color-blindness, contrast-checker, and…
May 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions express/code/blocks/color-extract/color-extract.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import loadColorExtractPlaceholders, { DEFAULT_PLACEHOLDERS as COLOR_EXTRACT_DEF
import loadImageUploadPlaceholders, { DEFAULT_PLACEHOLDERS as IMAGE_UPLOAD_DEFAULTS } from '../../scripts/color-shared/i18n/loadImageUploadPlaceholders.js';
import loadColorSwatchRailPlaceholders, { DEFAULT_PLACEHOLDERS as COLOR_SWATCH_RAIL_DEFAULTS } from '../../scripts/color-shared/i18n/loadColorSwatchRailPlaceholders.js';

let colorExtractKbCleanup = null;

const placeholdersPromise = Promise.all([
loadColorExtractPlaceholders(),
loadImageUploadPlaceholders(),
Expand Down Expand Up @@ -793,6 +795,24 @@ function renderColorVariant(block, rows, config, strings = {}) {
history.push(getHistoryState());
}

colorExtractKbCleanup?.();
const onExtractKeyDown = (e) => {
if (!e.metaKey && !e.ctrlKey) return;
if (e.key !== 'z') return;
const el = document.activeElement;
if (el && el !== document.body && el !== document.documentElement) {
if (['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON', 'A'].includes(el.tagName)) return;
if (el.isContentEditable) return;
if (parseInt(el.getAttribute('tabindex') ?? '-1', 10) >= 0) return;
if (['button', 'link', 'tab', 'slider', 'textbox', 'combobox'].includes(el.getAttribute('role'))) return;
}
e.preventDefault();
if (e.shiftKey) history.redo(getHistoryState());
else history.undo(getHistoryState());
};
document.addEventListener('keydown', onExtractKeyDown);
colorExtractKbCleanup = () => document.removeEventListener('keydown', onExtractKeyDown);

async function runExtraction(canvas, mood, count) {
const swatchCount = count || controller.getState().swatches.length || resolvedConfig.maxColors;
const ctx = canvas.getContext('2d');
Expand Down Expand Up @@ -1242,6 +1262,24 @@ async function renderGradientVariant(block, rows, config, strings = {}) {
history.push(getHistoryState());
}

colorExtractKbCleanup?.();
const onGradientKeyDown = (e) => {
if (!e.metaKey && !e.ctrlKey) return;
if (e.key !== 'z') return;
const el = document.activeElement;
if (el && el !== document.body && el !== document.documentElement) {
if (['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON', 'A'].includes(el.tagName)) return;
if (el.isContentEditable) return;
if (parseInt(el.getAttribute('tabindex') ?? '-1', 10) >= 0) return;
if (['button', 'link', 'tab', 'slider', 'textbox', 'combobox'].includes(el.getAttribute('role'))) return;
}
e.preventDefault();
if (e.shiftKey) history.redo(getHistoryState());
else history.undo(getHistoryState());
};
document.addEventListener('keydown', onGradientKeyDown);
colorExtractKbCleanup = () => document.removeEventListener('keydown', onGradientKeyDown);

gradientEditor.element.addEventListener('pointerdown', () => {
if (!gradientInteracting) {
gradientInteracting = true;
Expand Down
25 changes: 25 additions & 0 deletions express/code/blocks/color-wheel/color-wheel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,11 @@ async function buildDefaultActionMenuConfig(strings) {
const THEME_NAME = '';
const HISTORY_EVENT = `${ACTION_MENU_ID}:history-index-changed`;
const HISTORY_SKIP_SOURCES = new Set(['active-index', 'metadata', 'base-index']);
const KB_INTERACTIVE_TAGS = new Set(['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON', 'A']);
const KB_INTERACTIVE_ROLES = new Set([
'button', 'link', 'checkbox', 'menuitem', 'option',
'radio', 'tab', 'slider', 'spinbutton', 'textbox', 'combobox',
]);
let harmonyCarouselCleanup = null;
let harmonyStateUnsubscribe = null;
let layoutInstance = null;
Expand All @@ -258,6 +263,7 @@ let primaryColorAdapter = null;
let sidebarNaturalWidth = 0;
let sidebarTransitionCleanup = null;
let historyCleanup = null;
let keyboardCleanup = null;
let currentInitToken = 0;

function swatchHexListFromState(state) {
Expand Down Expand Up @@ -818,6 +824,8 @@ function cleanup() {
sidebarNaturalWidth = 0;
historyCleanup?.();
historyCleanup = null;
keyboardCleanup?.();
keyboardCleanup = null;
}

export default async function decorate(block) {
Expand Down Expand Up @@ -1057,6 +1065,23 @@ export default async function decorate(block) {
clearTimeout(historyDebounceTimer);
};

const onKeyDown = (e) => {
const el = document.activeElement;
if (el && el !== document.body && el !== document.documentElement) {
if (KB_INTERACTIVE_TAGS.has(el.tagName)) return;
if (el.isContentEditable) return;
if (parseInt(el.getAttribute('tabindex') ?? '-1', 10) >= 0) return;
if (KB_INTERACTIVE_ROLES.has(el.getAttribute('role'))) return;
}
if (e.key === ' ') {
e.preventDefault();
actionMenuApi?.generateRandom?.();
}
// Cmd/Ctrl+Z undo/redo handled by createColorToolLayout
};
document.addEventListener('keydown', onKeyDown);
keyboardCleanup = () => document.removeEventListener('keydown', onKeyDown);

tabs.setPanelEntryFocus('primary-color', () => {
primaryColorAdapter?.element?.shadowRoot?.querySelector('.bc-mode-trigger')?.focus();
});
Expand Down
1 change: 1 addition & 0 deletions express/code/scripts/color-shared/components/createActionMenuComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ export async function createActionMenuComponent(options = {}) {
getCurrentPalette: getCurrentPaletteFn,
undo: handleUndoState,
redo: handleRedoState,
generateRandom: handleGenerateRandom,
destroy() {
document.removeEventListener(eventName, handleHistoryIndexChanged);
container.remove();
Expand Down
35 changes: 34 additions & 1 deletion express/code/scripts/color-shared/shell/layouts/createColorToolLayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,29 @@ const DEFAULT_LAYOUT_SPANS = {

const TOOLBAR_VARIANTS = new Set(['inline', 'standalone', 'sticky', 'sticky-on-scroll']);

const KB_TAGS = new Set(['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON', 'A']);
const KB_ROLES = new Set([
'button', 'link', 'checkbox', 'menuitem', 'option',
'radio', 'tab', 'slider', 'spinbutton', 'textbox', 'combobox',
]);

function makeUndoRedoHandler(actionMenu) {
return (e) => {
if (!e.metaKey && !e.ctrlKey) return;
if (e.key !== 'z') return;

@echen-adobe echen-adobe May 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think something is broken with the undo / redo, if you generate 3 palettes, undo all of them, the redo combo no longer works. This could potentially fix that.

Suggested change
if (e.key !== 'z') return;
if (e.key.toLowerCase() !== 'z') return;

const el = document.activeElement;
if (el && el !== document.body && el !== document.documentElement) {
if (KB_TAGS.has(el.tagName)) return;
if (el.isContentEditable) return;
if (parseInt(el.getAttribute('tabindex') ?? '-1', 10) >= 0) return;
if (KB_ROLES.has(el.getAttribute('role'))) return;
}
e.preventDefault();
if (e.shiftKey) actionMenu.redo?.();
else actionMenu.undo?.();
};
}

const LAYOUT_DEPS = {
critical: ['scripts/color-shared/shell/layouts/styles/color-tool-layout.css'],
deferred: ['scripts/color-shared/action-menu.css'],
Expand Down Expand Up @@ -245,6 +268,7 @@ function createLayoutAPI(slots, shell, root) {
actionMenu: null,
toolbar: null,
onPaletteChange: () => {},
kbCleanup: null,
};

const layout = {
Expand Down Expand Up @@ -278,6 +302,8 @@ function createLayoutAPI(slots, shell, root) {

destroy() {
state.destroyed = true;
state.kbCleanup?.();
state.kbCleanup = null;
if (state.onPaletteChange) shell.context.off('palette', state.onPaletteChange);
state.actionMenu?.destroy();
state.toolbar?.destroy();
Expand Down Expand Up @@ -333,7 +359,14 @@ export default async function createColorToolLayout(container, config = {}) {
// Each callback guards against early destroy so it never mutates a torn-down layout.
layout.actionMenuReady = mountActionMenu(slots.topbar, actionMenuConfig, actionMenuModulePromise)
.then((handle) => {
if (!state.destroyed) state.actionMenu = handle;
if (!state.destroyed) {
state.actionMenu = handle;
if (handle) {
const onKeyDown = makeUndoRedoHandler(handle);
document.addEventListener('keydown', onKeyDown);
state.kbCleanup = () => document.removeEventListener('keydown', onKeyDown);
}
}
return handle;
})
.catch(() => null);
Expand Down
Loading