Compare commits

...

3 Commits

Author SHA1 Message Date
3f199cf43f
feat(text): change logic to properly use fontsize and update minimap
previously the minimap was hardcoded and thus wouldnt update the size of the text relative to its
real size. Im using a useEffect, which im not happy with. IMO you should not use state to set state,
but at the moment i dont really know what else to do, thus ithis is the solution.
2024-10-10 23:32:55 -04:00
d6504ce0ce
feat(text): fix bug trying to resize text moving element 2024-10-10 23:08:47 -04:00
9e1cf46756
feat(text): add text drop shadow and change shade of notes cards 2024-10-10 21:56:48 -04:00
6 changed files with 67 additions and 38 deletions

View File

@ -88,6 +88,12 @@ export function ImageCard({ key: itemKey, data: item }: ImageCard.ImageCardProps
window.removeEventListener('mouseup', _handleResizeMouseUp) window.removeEventListener('mouseup', _handleResizeMouseUp)
} }
function _handleClose(_e: Event) {
ImagesSignal.default.removeImage(item.id)
ImagesSignal.default.images.notify()
debounceLSUpdate()
}
return ( return (
<div <div
onmousedown={_handleMouseDown} onmousedown={_handleMouseDown}
@ -105,11 +111,9 @@ export function ImageCard({ key: itemKey, data: item }: ImageCard.ImageCardProps
backgroundPosition: 'center' backgroundPosition: 'center'
}} }}
> >
<button className="flex justify-center items-center hover:bg-blue-500 rounded w-5 h-5 dark:text-[#777] dark:hover:text-white text-white text-md absolute right-0 top-0" onclick={(_e: Event) => { <button
ImagesSignal.default.removeImage(item.id) className="flex justify-center items-center hover:bg-blue-500 rounded w-5 h-5 dark:text-[#777] dark:hover:text-white text-white text-md absolute right-0 top-0"
ImagesSignal.default.images.notify() onclick={_handleClose}>x</button>
debounceLSUpdate()
}}>x</button>
<ExpandIcon cb={_handleResizeMouseDown} /> <ExpandIcon cb={_handleResizeMouseDown} />
</div > </div >

View File

@ -129,8 +129,8 @@ export function MiniMap() {
onclick={_handleItemClick} onclick={_handleItemClick}
style={{ style={{
position: 'absolute', position: 'absolute',
width: `${300 / _MAP_SCALE_FACTOR}px`, width: `${text.dimensions.w / _MAP_SCALE_FACTOR}px`,
height: `${100 / _MAP_SCALE_FACTOR}px`, height: `${text.dimensions.h / _MAP_SCALE_FACTOR}px`,
top: `${(text.position.y / _MAP_SCALE_FACTOR)}px`, top: `${(text.position.y / _MAP_SCALE_FACTOR)}px`,
left: `${(text.position.x / _MAP_SCALE_FACTOR)}px`, left: `${(text.position.x / _MAP_SCALE_FACTOR)}px`,
border: '1px solid #222', border: '1px solid #222',

View File

@ -129,7 +129,7 @@ export function NoteCard({ key: itemKey, data: item }: NoteCard.NoteCardProps) {
<div <div
onmousedown={_handleFocusCard} onmousedown={_handleFocusCard}
style={cardPositionStyle} style={cardPositionStyle}
className="overflow-hidden text-[#333] dark:bg-[#1a1a1a] dark:border-[#1c1c1c] bg-[#eee] select-none transition flex flex-col justify-stretch shadow-md rounded border border-[#ddd] absolute" className="overflow-hidden text-[#333] dark:bg-[#1a1a1a] dark:border-[#1c1c1c] bg-[#efeff0] select-none transition flex flex-col justify-stretch shadow-md rounded border border-[#ddd] absolute"
> >
<div className="overflow-hidden flex-1 flex flex-col gap-1"> <div className="overflow-hidden flex-1 flex flex-col gap-1">
{/* Header Bar */} {/* Header Bar */}

View File

@ -1,8 +1,9 @@
import { signal, useRef } from "kaioken" import { signal, useEffect, useRef } from "kaioken"
import { TextSignal, focusedItem } from "../signals" import { TextSignal, focusedItem } from "../signals"
import { useDebounce } from "../utils/useDebounce" import { useDebounce } from "../utils/useDebounce"
import texts, { TextCardType } from "../signals/texts" import texts, { TextCardType } from "../signals/texts"
import { LayerEnum } from "../utils/enums" import { LayerEnum } from "../utils/enums"
import { Card } from "../types"
namespace TextItem { namespace TextItem {
export interface TextCardProps { export interface TextCardProps {
@ -18,6 +19,7 @@ export function TextItem({ key: itemKey, data: item }: TextItem.TextCardProps) {
const offsetX = useRef(0) const offsetX = useRef(0)
const offsetY = useRef(0) const offsetY = useRef(0)
const initialResizeX = useRef(0) const initialResizeX = useRef(0)
const elRef = useRef<HTMLDivElement>(null)
const { debounce } = useDebounce() const { debounce } = useDebounce()
@ -47,8 +49,9 @@ export function TextItem({ key: itemKey, data: item }: TextItem.TextCardProps) {
} }
function _handleMouseDown(e: MouseEvent) { function _handleMouseDown(e: MouseEvent) {
e.preventDefault()
focusedItem.value = itemKey focusedItem.value = itemKey
e.preventDefault()
e.stopPropagation()
offsetX.current = e.offsetX offsetX.current = e.offsetX
offsetY.current = e.offsetY offsetY.current = e.offsetY
pressed.value = true pressed.value = true
@ -59,47 +62,69 @@ export function TextItem({ key: itemKey, data: item }: TextItem.TextCardProps) {
function _handleResizeMove(e: MouseEvent) { function _handleResizeMove(e: MouseEvent) {
const { pageX } = e const { pageX } = e
const newX = initialResizeX.current - pageX const newX = initialResizeX.current - pageX
const newFontSize = Math.floor(-newX + item.fontSize)
const newW = -newX + item.dimensions.w TextSignal.default.updateTextProperty(itemKey, 'fontSize', newFontSize)
const newDim = { w: newW, h: 0 }
TextSignal.default.updateTextProperty(itemKey, 'dimensions', newDim)
TextSignal.default.texts.notify() TextSignal.default.texts.notify()
} }
useEffect(() => {
const elDems = elRef.current?.getBoundingClientRect()
const elW = elDems?.width ?? 100
const elH = elDems?.height ?? 100
const newDems: Card<'texts'>['dimensions'] = { w: elW, h: elH }
TextSignal.default.updateTextProperty(itemKey, 'dimensions', newDems)
TextSignal.default.texts.notify()
}, [elRef.current, item.fontSize])
function _handleResizeMouseDown(e: MouseEvent) { function _handleResizeMouseDown(e: MouseEvent) {
e.stopPropagation()
initialResizeX.current = e.pageX initialResizeX.current = e.pageX
pressed.value = true pressed.value = true
window.addEventListener('mousemove', _handleResizeMove) window.addEventListener('mousemove', _handleResizeMove)
window.addEventListener('mouseup', _handleResizeMouseUp) window.addEventListener('mouseup', _handleResizeMouseUp)
} }
function _handleResizeMouseUp() { function _handleResizeMouseUp(_e: MouseEvent) {
pressed.value = false pressed.value = false
updateLocalStorage()
window.removeEventListener('mousemove', _handleResizeMove) window.removeEventListener('mousemove', _handleResizeMove)
window.removeEventListener('mouseup', _handleResizeMouseUp) window.removeEventListener('mouseup', _handleResizeMouseUp)
updateLocalStorage()
} }
return ( return (
<div <div
ref={elRef}
onmousedown={_handleMouseDown} onmousedown={_handleMouseDown}
className="px-4 select-none transition flex flex-col justify-stretch rounded absolute" className="px-4 transition flex flex-col justify-stretch rounded absolute"
style={{ style={{
outline: `${focusedItem.value === item.id ? '1px solid' : ''}`, outline: `${focusedItem.value === item.id ? '1px solid' : ''}`,
fontSize: `${item.dimensions.w / 6}px`, fontSize: `${item.fontSize / 6}px`,
zIndex: `${focusedItem.value == itemKey ? LayerEnum.CARD_ELEVATED : LayerEnum.CARD}`, zIndex: `${focusedItem.value == itemKey ? LayerEnum.CARD_ELEVATED : LayerEnum.CARD}`,
top: `${item.position.y}px`, top: `${item.position.y}px`,
left: `${item.position.x}px`, left: `${item.position.x}px`,
}} }}
> >
<div className={'relative'}> <div className={'select-none drop-shadow relative'}>
{item.contents} {item.contents}
</div> </div>
<ExpandIcon cb={_handleResizeMouseDown} item={item} />
</div >
)
}
function ExpandIcon({ cb, item }: {
cb: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null | undefined,
item: TextSignal.TextCardType
}) {
return (
<svg <svg
onclick={_handleResizeMouseDown} onmousedown={cb}
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
width="24" width="24"
height="24" height="24"
@ -109,15 +134,12 @@ export function TextItem({ key: itemKey, data: item }: TextItem.TextCardProps) {
stroke-width="2" stroke-width="2"
stroke-linecap="round" stroke-linecap="round"
stroke-linejoin="round" stroke-linejoin="round"
className="h-4 w-4 absolute right-[-4px] bottom-[-4px] cursor-se-resize" className="h-4 w-4 absolute right-[-6px] bottom-[-6px] cursor-se-resize"
style={{ style={{
display: focusedItem.value === item.id ? 'unset' : 'none' display: focusedItem.value === item.id ? 'unset' : 'none'
}} }}
> >
<rect width="18" height="18" x="3" y="3" rx="2" /> <rect width="18" height="18" x="3" y="3" rx="2" />
</svg> </svg>
</div >
) )
} }

View File

@ -8,6 +8,7 @@ export function TextButton() {
function _handleClick(e: MouseEvent) { function _handleClick(e: MouseEvent) {
TextSignal.default.addText({ TextSignal.default.addText({
fontSize: 10,
type: "texts", type: "texts",
title: "New Note", title: "New Note",
contents: "todo: fill me", contents: "todo: fill me",

View File

@ -2,7 +2,9 @@ import { signal } from "kaioken"
import { Card } from "../types" import { Card } from "../types"
import { focusedItem } from "." import { focusedItem } from "."
export type TextCardType = Card<"texts"> export type TextCardType = Card<"texts"> & {
fontSize: number
}
const texts = signal<Record<TextCardType["id"], TextCardType>>({}) const texts = signal<Record<TextCardType["id"], TextCardType>>({})