diff --git a/docs/docs/behaviors/hold-tap.md b/docs/docs/behaviors/hold-tap.md index fda50f23..c410183d 100644 --- a/docs/docs/behaviors/hold-tap.md +++ b/docs/docs/behaviors/hold-tap.md @@ -40,6 +40,7 @@ values={[ {label: 'Hold-Preferred', value: 'hold-preferred'}, {label: 'Balanced', value: 'balanced'}, {label: 'Tap-Preferred', value: 'tap-preferred'}, +{label: 'Tap-Unless-Interrupted', value: 'tap-unless-interrupted'}, ]}> @@ -70,6 +71,14 @@ On the other hand, if the interrupting key is released before the hold-tap, the + + + + + + + + ![Hold-tap comparison](../assets/hold-tap/comparison.svg) diff --git a/docs/src/animationhelpers/src/hold_tap/tap_preferred_hold_tap_up.meta b/docs/src/animationhelpers/src/hold_tap/tap_preferred_hold_tap_up.meta new file mode 100644 index 00000000..0e33e3fe --- /dev/null +++ b/docs/src/animationhelpers/src/hold_tap/tap_preferred_hold_tap_up.meta @@ -0,0 +1,3 @@ +{ + "version": 0 +} \ No newline at end of file diff --git a/docs/src/animationhelpers/src/hold_tap/tap_preferred_hold_tap_up.ts b/docs/src/animationhelpers/src/hold_tap/tap_preferred_hold_tap_up.ts new file mode 100644 index 00000000..19279336 --- /dev/null +++ b/docs/src/animationhelpers/src/hold_tap/tap_preferred_hold_tap_up.ts @@ -0,0 +1,8 @@ +import { makeProject } from "@motion-canvas/core/lib"; + +import tap_preferred_hold_tap_up from "../scenes/hold_tap/tap_preferred_hold_tap_up?scene"; + +export default makeProject({ + scenes: [tap_preferred_hold_tap_up], + background: "#FFFFFF", +}); diff --git a/docs/src/animationhelpers/src/scenes/hold_tap/tap_preferred_hold_tap_up.meta b/docs/src/animationhelpers/src/scenes/hold_tap/tap_preferred_hold_tap_up.meta new file mode 100644 index 00000000..0e33e3fe --- /dev/null +++ b/docs/src/animationhelpers/src/scenes/hold_tap/tap_preferred_hold_tap_up.meta @@ -0,0 +1,3 @@ +{ + "version": 0 +} \ No newline at end of file diff --git a/docs/src/animationhelpers/src/scenes/hold_tap/tap_preferred_hold_tap_up.tsx b/docs/src/animationhelpers/src/scenes/hold_tap/tap_preferred_hold_tap_up.tsx new file mode 100644 index 00000000..6c92bac5 --- /dev/null +++ b/docs/src/animationhelpers/src/scenes/hold_tap/tap_preferred_hold_tap_up.tsx @@ -0,0 +1,53 @@ +import { makeScene2D } from "@motion-canvas/2d/lib/scenes"; +import { makeRefs } from "@motion-canvas/core/lib/utils"; +import { any, all, chain, delay, waitFor } from "@motion-canvas/core/lib/flow"; +import Key, { KeyTravel } from "../../components/Key"; +import Output from "../../components/Output"; +import { linear } from "@motion-canvas/core/lib/tweening"; + +export default makeScene2D(function* (view) { + const interrupt = makeRefs(); + view.add(); + interrupt.group.position.x(125); + interrupt.group.position.y(-150); + interrupt.duration.fill("#D9D9D9"); + + const hold = makeRefs(); + view.add(); + hold.group.position.x(-125); + hold.group.position.y(-150); + hold.duration.fill("#D9D9D9"); + + const hold_output = makeRefs(); + view.add(); + hold_output.group.position(hold.group.position().addX(125)); + hold_output.group.position.y(hold_output.group.position.y() + 300); + + yield* waitFor(0.5); + yield* any( + hold.body.position.y(KeyTravel, 0.15), + hold.duration.grow(0.5, 1, linear) + ); + yield* delay( + 0.35, + all( + interrupt.body.position.y(KeyTravel, 0.15), + hold.duration.fill("F21D00", 0.15) + ) + ); + yield* delay( + 0.35, + chain( + hold.body.position.y(0, 0.15), + hold.group.rotation(3, 0.03), + hold.group.rotation(-3, 0.06), + hold.group.rotation(0, 0.03), + hold.duration.grow(0, 0.15), + delay(0.05, hold_output.output.text("f", 0)), + delay(0.05, hold_output.output.text("fj", 0)) + ) + ); + yield* waitFor(0.25); + yield* interrupt.body.position.y(0, 0.15); + yield* waitFor(1); +}); diff --git a/docs/src/animationhelpers/vite.config.ts b/docs/src/animationhelpers/vite.config.ts index bdfa2d53..eb726d14 100644 --- a/docs/src/animationhelpers/vite.config.ts +++ b/docs/src/animationhelpers/vite.config.ts @@ -9,6 +9,7 @@ export default defineConfig({ "./src/hold_tap/hold_tap_interrupted.ts", "./src/hold_tap/balanced_other_key_up.ts", "./src/hold_tap/balanced_hold_tap_up.ts", + "./src/hold_tap/tap_preferred_hold_tap_up.ts", ], }), ],