Skip to content

Add font picker to the styles popover #35

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

Open
calumk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add font picker to the styles popover #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/core/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export { Editor, TOOLS } from './editor.js'
export { Store, newId, isDiffEmpty, invertDiff, composeDiff, packDiff, unpackDiff, streamDiffs } from './store.js'
export { buildUI } from './ui.js'
export {
themeOf, THEMES, COLOR_IDS, SIZE_IDS, DASH_IDS, FILL_IDS, GEO_IDS, GRID_IDS,
themeOf, THEMES, COLOR_IDS, SIZE_IDS, DASH_IDS, FILL_IDS, FONT_IDS, GEO_IDS, GRID_IDS,
SIZES, FONT_SIZES, FONTS,
} from './palette.js'
export { pageBounds, localBounds, drawShape, hitShape } from './shapes.js'
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/palette.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ export const NOTE_FONT_SIZES = { s: 16, m: 20, l: 26, xl: 32 }

export const DASH_IDS = ['draw', 'solid', 'dashed', 'dotted']
export const FILL_IDS = ['none', 'semi', 'solid', 'pattern']
export const FONT_IDS = ['draw', 'sans', 'serif', 'mono']

export const FONTS = {
// 'Quickdraw Hand' is Libre Baskerville, bundled via quickdraw.css; the rest are
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/quickdraw.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@
.qd-opt svg { width: 20px; height: 20px; }
.qd-opt:hover { background: var(--qd-hover); }
.qd-opt.on { background: var(--qd-on-bg); color: var(--qd-on-ink); }
.qd-fonts .qd-opt { width: auto; min-width: 44px; padding: 0 8px; font-size: 15px; }
.qd-opacity { gap: 10px; padding: 2px 4px 0; }
.qd-opacity-label { font: 500 12px/1 -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; color: var(--qd-ink-soft); }
.qd-opacity-val {
Expand Down
12 changes: 11 additions & 1 deletion packages/core/src/ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// the standard set users already know.
// Dependency-free ESM (see palette.js).

import { COLOR_IDS, SIZE_IDS, DASH_IDS, FILL_IDS, GEO_IDS, GRID_IDS, THEMES } from './palette.js'
import { COLOR_IDS, SIZE_IDS, DASH_IDS, FILL_IDS, FONT_IDS, GEO_IDS, GRID_IDS, THEMES, FONTS } from './palette.js'

const SVG = (inner) =>
`<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">${inner}</svg>`
Expand Down Expand Up @@ -281,6 +281,15 @@ export function buildUI(editor, { hidden = false, onSave, themeToggle = true, gr
b.addEventListener('click', (e) => { e.stopPropagation(); editor.setStyle('fill', f); restyle() })
fills.appendChild(b)
}
const fonts = row('qd-fonts')
const FONT_LABELS = { draw: 'Hand', sans: 'Sans', serif: 'Serif', mono: 'Mono' }
for (const f of FONT_IDS) {
const b = el('button', 'qd-opt' + (cur.font === f ? ' on' : ''))
b.title = 'font: ' + (FONT_LABELS[f] || f)
b.innerHTML = `<span style="font-family:${FONTS[f]}">Ag</span>`
b.addEventListener('click', (e) => { e.stopPropagation(); editor.setStyle('font', f); restyle() })
fonts.appendChild(b)
}
// opacity: one slider, 10–100%. A drag is a single undo step.
const opac = row('qd-opacity')
opac.innerHTML = '<span class="qd-opacity-label">Opacity</span><input type="range" min="10" max="100" step="5" aria-label="Opacity"><span class="qd-opacity-val"></span>'
Expand Down Expand Up @@ -310,6 +319,7 @@ export function buildUI(editor, { hidden = false, onSave, themeToggle = true, gr
sizes.querySelectorAll('.qd-opt').forEach((b, i) => b.classList.toggle('on', SIZE_IDS[i] === c2.size))
dashes.querySelectorAll('.qd-opt').forEach((b, i) => b.classList.toggle('on', DASH_IDS[i] === c2.dash))
fills.querySelectorAll('.qd-opt').forEach((b, i) => b.classList.toggle('on', FILL_IDS[i] === c2.fill))
fonts.querySelectorAll('.qd-opt').forEach((b, i) => b.classList.toggle('on', FONT_IDS[i] === c2.font))
showOpacity(c2.opacity)
refresh()
}
Expand Down
1 change: 1 addition & 0 deletions packages/core/types/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ export const COLOR_IDS: ColorId[]
export const SIZE_IDS: SizeId[]
export const DASH_IDS: DashId[]
export const FILL_IDS: FillId[]
export const FONT_IDS: FontId[]
export const GEO_IDS: GeoId[]
export const GRID_IDS: GridId[]
export const THEMES: Record<ThemeId, Theme>
Expand Down