Skip to content
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

feat: Animate the mode selector bar at the top of the page #374

Merged
merged 2 commits into from
Sep 17, 2024
Merged

feat: Animate the mode selector bar at the top of the page #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9dc146
feat: Animate the mode selector bar at the top of the page
kash-eesh Sep 17, 2024
b0c4c40
Merge branch 'main' of https://github.com/kash-eesh/onlook
kash-eesh Sep 17, 2024
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
4 changes: 2 additions & 2 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"embla-carousel-react": "^8.3.0",
"embla-carousel-wheel-gestures": "^8.0.1",
"fflate": "^0.8.2",
"framer-motion": "^11.2.12",
"framer-motion": "^11.5.4",
"js-string-escape": "^1.0.1",
"localtunnel": "^2.0.2",
"lodash.debounce": "^4.0.8",
Expand All @@ -87,8 +87,8 @@
"@eslint/compat": "^1.1.1",
"@eslint/js": "^9.7.0",
"@playwright/test": "^1.42.1",
"@types/babel-generator": "^6.25.8",
"@types/babel__traverse": "^7.20.6",
"@types/babel-generator": "^6.25.8",
"@types/bun": "^1.1.6",
"@types/css-tree": "^2.3.8",
"@types/culori": "^2.1.0",
Expand Down
67 changes: 42 additions & 25 deletions app/src/routes/editor/TopBar/ModeToggle/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React, { useEffect, useState } from 'react';
import { motion } from 'framer-motion';
import { HotKeyLabel } from '@/components/ui/hotkeys-label';
import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group';
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
import { EditorMode } from '@/lib/models';
import { observer } from 'mobx-react-lite';
import { useEffect, useState } from 'react';
import { useEditorEngine } from '../..';
import { capitalizeFirstLetter } from '/common/helpers';
import { Hotkey } from '/common/hotkeys';
Expand Down Expand Up @@ -35,37 +36,53 @@ const ModeToggle = observer(() => {
}

return (
<ToggleGroup
className="font-normal -mt-2"
type="single"
value={mode}
onValueChange={(value) => {
if (value) {
editorEngine.mode = value as EditorMode;
setMode(value as EditorMode);
}
}}
>
{MODE_TOGGLE_ITEMS.map((item) => (
<Tooltip key={item.mode}>
<TooltipTrigger asChild>
<div>
<div className="relative">
<ToggleGroup
className="font-normal"
type="single"
value={mode}
onValueChange={(value) => {
if (value) {
editorEngine.mode = value as EditorMode;
setMode(value as EditorMode);
}
}}
>
{MODE_TOGGLE_ITEMS.map((item) => (
<Tooltip key={item.mode}>
<TooltipTrigger asChild>
<ToggleGroupItem
variant={'overline'}
value={item.mode}
aria-label={item.hotkey.description}
className={`transition-all duration-300 ease-in-out px-4 py-2 ${
mode === item.mode ? 'text-white font-bold' : 'font-normal'
}`}
>
{capitalizeFirstLetter(item.mode)}
</ToggleGroupItem>
</div>
</TooltipTrigger>
<TooltipContent side="bottom">
<HotKeyLabel hotkey={item.hotkey} />
</TooltipContent>
</Tooltip>
))}
</ToggleGroup>
</TooltipTrigger>
<TooltipContent side="bottom">
<HotKeyLabel hotkey={item.hotkey} />
</TooltipContent>
</Tooltip>
))}
</ToggleGroup>
<motion.div
className="absolute -top-1 h-0.5 bg-white"
initial={false}
animate={{
width: '50%',
x: mode === EditorMode.DESIGN ? '0%' : '100%'
}}
transition={{
type: 'tween',
ease: 'easeInOut',
duration: 0.3
}}
/>
</div>
);
});

export default ModeToggle;
export default ModeToggle;
2 changes: 1 addition & 1 deletion demos/next/next-env.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.