-
-
Notifications
You must be signed in to change notification settings - Fork 28
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.
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
fix(zoom): making zoom in+out a usable feature #116
Open
pongstr
wants to merge
2
commits into
zmkfirmware:main
Choose a base branch
from
pongstr:fix-zoom-in-out
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+176
−92
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,141 @@ | ||
import { FC, PropsWithChildren, useEffect, useRef } from "react"; | ||
import { useLocalStorageState } from "../misc/useLocalStorageState"; | ||
import { ExpandIcon, MaximizeIcon, ShrinkIcon } from "lucide-react"; | ||
|
||
type KeyboardViewportType = PropsWithChildren<{ | ||
className?: string; | ||
}>; | ||
|
||
const KEYMAP_SCALE = "keymapScale"; | ||
const DEFAULT_SCALE = 1; | ||
|
||
export const KeyboardViewport: FC<KeyboardViewportType> = ({ | ||
pongstr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
children, | ||
className, | ||
}) => { | ||
const targetRef = useRef<HTMLDivElement>(null); | ||
|
||
const [scale, setScale] = useLocalStorageState(KEYMAP_SCALE, DEFAULT_SCALE); | ||
|
||
const resetScale = () => { | ||
if (!targetRef.current) return; | ||
targetRef.current.style.translate = "unset"; | ||
targetRef.current.style.setProperty("transform", "scale(1)"); | ||
setScale(DEFAULT_SCALE); | ||
}; | ||
|
||
useEffect(() => { | ||
if (!targetRef.current) return; | ||
|
||
const target = targetRef.current; | ||
const offset = { x: 0, y: 0 }; | ||
let isPanningActive = false; | ||
|
||
function keyDownPanStart(e: KeyboardEvent) { | ||
if (e.key !== " ") return; | ||
e.preventDefault(); | ||
|
||
target.style.cursor = "grab"; | ||
isPanningActive = true; | ||
} | ||
|
||
function pointerDownPanStart(e: PointerEvent) { | ||
if (e.button !== 0) return; | ||
e.preventDefault(); | ||
|
||
target.style.cursor = "grab"; | ||
isPanningActive = true; | ||
} | ||
|
||
function keyUpPanEnd(e: KeyboardEvent) { | ||
if (e.key !== " ") return; | ||
isPanningActive = false; | ||
target.style.cursor = "unset"; | ||
} | ||
|
||
function panMove(e: PointerEvent) { | ||
if (!isPanningActive) return; | ||
offset.x += e.movementX; | ||
offset.y += e.movementY; | ||
target.style.translate = `${offset.x}px ${offset.y}px`; | ||
} | ||
|
||
function pointerUpPanEnd() { | ||
isPanningActive = false; | ||
target.style.cursor = "unset"; | ||
} | ||
|
||
document.addEventListener("keydown", keyDownPanStart); | ||
document.addEventListener("keyup", keyUpPanEnd); | ||
|
||
target.addEventListener("pointermove", panMove); | ||
target.addEventListener("pointerdown", pointerDownPanStart); | ||
target.addEventListener("pointerup", pointerUpPanEnd); | ||
target.addEventListener("pointerleave", pointerUpPanEnd); | ||
|
||
return () => { | ||
document.removeEventListener("keydown", keyDownPanStart); | ||
document.removeEventListener("keyup", keyUpPanEnd); | ||
|
||
target.removeEventListener("pointermove", panMove); | ||
target.removeEventListener("pointerdown", pointerDownPanStart); | ||
target.removeEventListener("pointerup", pointerUpPanEnd); | ||
target.removeEventListener("pointerleave", pointerUpPanEnd); | ||
}; | ||
}, []); | ||
|
||
return ( | ||
<div | ||
className={[ | ||
"relative size-full overflow-hidden p-0 touch-none", | ||
className, | ||
].join(" ")} | ||
> | ||
<div | ||
ref={targetRef} | ||
style={{ transform: `scale(${scale})` }} | ||
className="flex size-full origin-center items-center justify-center transition-transform" | ||
> | ||
{children} | ||
</div> | ||
|
||
<div className="absolute bottom-8 left-0 flex justify-center items-center w-full gap-1 rounded-xl bg-muted py-1 select-none bg-base-300"> | ||
<button | ||
className="block h-9 px-4 py-1.5 bg-base-100 rounded-l-lg disabled:opacity-50 disabled:cursor-not-allowed" | ||
disabled={scale <= 0.25} | ||
onClick={() => setScale((prev: number) => prev - 0.05)} | ||
> | ||
<ShrinkIcon className="size-4" /> | ||
<span className="sr-only">Decrease scale</span> | ||
</button> | ||
<div className="flex h-9 px-2 justify-center items-center bg-base-100"> | ||
<input | ||
type="range" | ||
name="scale" | ||
min={0.25} | ||
max={2} | ||
step={0.01} | ||
className="mx-auto h-1 w-28 cursor-pointer appearance-none rounded-lg" | ||
value={scale} | ||
onChange={(e) => setScale(Number(e.target.value))} | ||
/> | ||
</div> | ||
<button | ||
className="block h-9 px-4 py-1.5 bg-base-100 disabled:opacity-50 disabled:cursor-not-allowed" | ||
disabled={scale >= 2} | ||
onClick={() => setScale((prev: number) => prev + 0.05)} | ||
> | ||
<ExpandIcon className="size-4" /> | ||
<span className="sr-only">Increase scale</span> | ||
</button> | ||
<button | ||
className="block px-4 py-1.5 bg-base-100 rounded-r-lg h-9 disabled:opacity-50 disabled:cursor-not-allowed" | ||
onClick={resetScale} | ||
> | ||
<MaximizeIcon className="size-4" /> | ||
<span className="sr-only">Reset scale</span> | ||
</button> | ||
</div> | ||
</div> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
useLocalStorageState
was created for future local storage uses. I don't think we should remove it #31 (comment)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
restored
useLocalStorageState
, i slightly modified the hook to have default serialize+deserializer, imho, these options should only be required for specific serialize+deserializer functions. lmk what you think ^^