-
Notifications
You must be signed in to change notification settings - Fork 165
app/vmui: add per-instance favicon color customization #1646
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
Open
Loori-R
wants to merge
1
commit into
master
Choose a base branch
from
vmui/issue-1634/customize-favicon-color
base: master
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.
Open
Changes from all commits
Commits
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 hidden or 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
File renamed without changes
61 changes: 61 additions & 0 deletions
61
...src/components/Configurators/GlobalSettings/BrowserTabController/BrowserTabController.tsx
This file contains hidden or 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,61 @@ | ||
| import { FC, useMemo } from "preact/compat"; | ||
| import "./style.scss"; | ||
| import { createFaviconUrl } from "../../../../utils/favicon"; | ||
| import { faviconColors } from "../../../../constants/faviconsColors"; | ||
| import classNames from "classnames"; | ||
| import { useBrowserTabSync } from "./hooks/useBrowserTabSync"; | ||
| import { CloseIcon } from "../../../Main/Icons"; | ||
|
|
||
| const BrowserTabController: FC = () => { | ||
| const { faviconColor, changeFaviconColor } = useBrowserTabSync(); | ||
|
|
||
| const faviconUrl = useMemo(() => { | ||
| return createFaviconUrl(faviconColor); | ||
| }, [faviconColor]); | ||
|
|
||
| const createHandlerClick = (color?: string) => () => { | ||
| changeFaviconColor(color); | ||
| }; | ||
|
|
||
| return ( | ||
| <div className="vm-browser-tab-controller"> | ||
| <p className="vm-server-configurator__title">Favicon color</p> | ||
|
|
||
| <div className="vm-browser-tab-controller-palette"> | ||
| <div className="vm-browser-tab-controller-palette-list"> | ||
| <button | ||
| className="vm-browser-tab-controller-palette-list__item vm-browser-tab-controller-palette-list__item_reset" | ||
| type="button" | ||
| onClick={createHandlerClick()} | ||
| aria-label="Reset favicon color" | ||
| > | ||
| <CloseIcon /> | ||
| </button> | ||
|
|
||
| {faviconColors.map(color => ( | ||
| <button | ||
| className={classNames({ | ||
| "vm-browser-tab-controller-palette-list__item": true, | ||
| "vm-browser-tab-controller-palette-list__item_selected": faviconColor === color | ||
| })} | ||
| key={color} | ||
| type="button" | ||
| style={{ color }} | ||
| onClick={createHandlerClick(color)} | ||
| aria-label={`Set favicon color to ${color}`} | ||
| aria-pressed={faviconColor === color} | ||
| /> | ||
| ))} | ||
| </div> | ||
|
|
||
| <img | ||
| className="vm-browser-tab-controller-palette__preview" | ||
| src={faviconUrl} | ||
| alt="Favicon preview" | ||
| /> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default BrowserTabController; | ||
48 changes: 48 additions & 0 deletions
48
...c/components/Configurators/GlobalSettings/BrowserTabController/hooks/useBrowserTabSync.ts
This file contains hidden or 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,48 @@ | ||
| import useEventListener from "../../../../../hooks/useEventListener"; | ||
| import { useEffect, useState } from "preact/compat"; | ||
| import { getFromStorage, saveToStorage } from "../../../../../utils/storage"; | ||
| import { getFaviconStorageKey, updateFaviconColor } from "../../../../../utils/favicon"; | ||
|
|
||
| const FAVICON_STORAGE_KEY = "FAVICON_COLOR"; | ||
|
|
||
| const storageKey = getFaviconStorageKey(); | ||
|
|
||
| const getColorsFromStorage = () => { | ||
| return getFromStorage(FAVICON_STORAGE_KEY) as Record<string, string> | null; | ||
| }; | ||
|
|
||
| export const useBrowserTabSync = () => { | ||
| const [faviconColor, setFaviconColor] = useState(() => getColorsFromStorage()?.[storageKey]); | ||
|
|
||
| const handleUpdateColor = () => { | ||
| const colorsFromStorage = getColorsFromStorage(); | ||
| const color = colorsFromStorage?.[storageKey]; | ||
| setFaviconColor(color); | ||
| }; | ||
|
|
||
| const changeFaviconColor = (color?: string) => { | ||
| const { [storageKey]: _, ...colorsFromStorage } = getColorsFromStorage() || {}; | ||
| const nextColors = { ...colorsFromStorage }; | ||
|
|
||
| if (color) { | ||
| nextColors[storageKey] = color; | ||
| } | ||
|
|
||
| saveToStorage(FAVICON_STORAGE_KEY, nextColors); | ||
|
Loori-R marked this conversation as resolved.
|
||
| }; | ||
|
|
||
| useEffect(() => { | ||
| handleUpdateColor(); | ||
| }, []); | ||
|
|
||
| useEffect(() => { | ||
| updateFaviconColor(faviconColor); | ||
| }, [faviconColor]); | ||
|
|
||
| useEventListener("storage", handleUpdateColor); | ||
|
|
||
| return { | ||
| faviconColor, | ||
| changeFaviconColor, | ||
| }; | ||
| }; | ||
77 changes: 77 additions & 0 deletions
77
...packages/vmui/src/components/Configurators/GlobalSettings/BrowserTabController/style.scss
This file contains hidden or 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,77 @@ | ||
| @use "src/styles/variables" as *; | ||
|
|
||
| $color-item-size: 28px; | ||
| $outline-width: 2px; | ||
| $outline-offset: 2px; | ||
| $outline-space: $outline-width + $outline-offset; | ||
|
|
||
| .vm-browser-tab-controller { | ||
| .vm-server-configurator__title { | ||
| padding-bottom: 2px; | ||
| } | ||
|
|
||
| &-palette { | ||
| display: flex; | ||
| align-items: flex-start; | ||
| justify-content: space-between; | ||
| gap: calc($padding-large * 2); | ||
|
|
||
| &-list { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: flex-start; | ||
| flex-wrap: wrap; | ||
| gap: $padding-small; | ||
|
|
||
| &__item { | ||
| width: $color-item-size; | ||
| height: $color-item-size; | ||
| aspect-ratio: 1; | ||
| border-radius: 50%; | ||
| background-color: currentColor; | ||
| cursor: pointer; | ||
| transition-property: transform; | ||
| transition-duration: 0.15s; | ||
| transition-timing-function: linear; | ||
|
|
||
| &:hover { | ||
|
cubic-dev-ai[bot] marked this conversation as resolved.
|
||
| transform: scale(1.1); | ||
| } | ||
|
|
||
| &:focus-visible { | ||
| transform: scale(1.1); | ||
| } | ||
|
|
||
| &_reset { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| background: transparent; | ||
| border: $border-divider; | ||
| color: $color-text-disabled; | ||
| padding: calc($padding-small / 2); | ||
| } | ||
|
|
||
| &_selected { | ||
| width: $color-item-size - 2 * $outline-space; | ||
| height: $color-item-size - 2 * $outline-space; | ||
| margin: $outline-space; | ||
| outline: $outline-width solid currentColor; | ||
| outline-offset: $outline-offset; | ||
| pointer-events: none; | ||
| } | ||
| } | ||
|
|
||
| &__input { | ||
| position: absolute; | ||
| z-index: -1; | ||
| opacity: 0; | ||
| } | ||
| } | ||
|
|
||
| &__preview { | ||
| width: $color-item-size; | ||
| height: auto; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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
19 changes: 19 additions & 0 deletions
19
...ui/packages/vmui/src/components/Configurators/GlobalSettings/QueryTimeOverride/style.scss
This file contains hidden or 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,19 @@ | ||
| @use "src/styles/variables" as *; | ||
|
|
||
| .vm-time-override-controller { | ||
| background-color: $color-hover-black; | ||
| border-radius: $border-radius-medium; | ||
| padding: $padding-large; | ||
| border: $border-divider; | ||
|
|
||
| .vm-server-configurator__title { | ||
| margin: 0; | ||
| } | ||
|
|
||
| &__description { | ||
| padding-top: $padding-global; | ||
| font-size: $font-size-small; | ||
| line-height: 1.3; | ||
| text-wrap: pretty; | ||
| } | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.