Update Night Sky Panel's Markings tab + Small Sun Tab refactor #207
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
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,3 @@ | ||
| .card:active { | ||
| transform: translateY(2px); | ||
| } |
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,37 @@ | ||
| import { PropsWithChildren, useEffect, useState } from 'react'; | ||
| import { Checkbox, CheckboxCardProps } from '@mantine/core'; | ||
|
|
||
| import styles from './ToggleCard.module.css'; | ||
|
|
||
| interface Props extends CheckboxCardProps, PropsWithChildren { | ||
| onClick: () => void; | ||
| checked: boolean; | ||
| } | ||
|
|
||
| export function ToggleCard({ onClick, checked, children, ...other }: Props) { | ||
| const [checkedState, setCheckedState] = useState(checked); | ||
|
|
||
| function handleClick() { | ||
| setCheckedState(!checkedState); | ||
| onClick(); | ||
| } | ||
|
|
||
| useEffect(() => { | ||
| setCheckedState(checked); | ||
| }, [checked]); | ||
|
|
||
| return ( | ||
| <Checkbox.Card | ||
| classNames={styles} | ||
| checked={checkedState} | ||
| onClick={handleClick} | ||
| bg={checkedState ? 'blue' : 'dark.8'} | ||
| role={'switch'} | ||
| aria-checked={checkedState} | ||
| style={{ fontWeight: checkedState ? '500' : undefined }} | ||
| {...other} | ||
| > | ||
| {children} | ||
| </Checkbox.Card> | ||
| ); | ||
| } |
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 |
|---|---|---|
|
|
@@ -132,6 +132,8 @@ export { | |
| TbClock as ClockIcon, | ||
| TbClockX as ClockOffIcon, | ||
| TbCompass as CompassMarksIcon, | ||
| TbLetterA as LetterAIcon, | ||
| TbLetterASmall as LetterASmallIcon, | ||
| TbSphere as LineIcon, | ||
| TbRepeat as RepeatIcon, | ||
| TbRepeatOff as RepeatOffIcon, | ||
|
|
||
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,164 @@ | ||
| import { useCallback, useEffect, useState } from 'react'; | ||
| import { useTranslation } from 'react-i18next'; | ||
| import { | ||
| Box, | ||
| Group, | ||
| SegmentedControl, | ||
| Skeleton, | ||
| Stack, | ||
| Switch, | ||
| Text | ||
| } from '@mantine/core'; | ||
|
|
||
| import { useOpenSpaceApi } from '@/api/hooks'; | ||
| import { useProperty } from '@/hooks/properties'; | ||
| import { CompassSmallIcon, LetterAIcon, LetterASmallIcon } from '@/icons/icons'; | ||
| import { IconSize } from '@/types/enums'; | ||
|
|
||
| import { SceneGraphNodeToggle } from './SceneGraphNodeToggle'; | ||
|
|
||
| // @TODO (2025-05-19, emmbr) These checks, especially against the parts of the texture | ||
| // file names, are fragile agains file name changes. Consider more robust solution | ||
| const Data = { | ||
| small: { | ||
| showAction: 'os.nightsky.ShowNeswLettersSmall', | ||
| hideAction: 'os.nightsky.HideNesw', | ||
| textureCheck: 'red_small.png' | ||
| }, | ||
| large: { | ||
| showAction: 'os.nightsky.ShowNeswLetters', | ||
| hideAction: 'os.nightsky.HideNesw', | ||
| textureCheck: 'red.png' | ||
| }, | ||
| marks: { | ||
| showAction: 'os.nightsky.AddNeswBandMarks', | ||
| hideAction: 'os.nightsky.RemoveNeswBandMarks', | ||
| textureCheck: '_lines_' | ||
| } | ||
| }; | ||
|
|
||
| // @TODO (2025-05-19, emmbr) This component needs logic for checking if the used actions | ||
| // exist. However, for this we need to be able to access the actions state using the | ||
| // identifier of the action, so leaving for now | ||
|
|
||
| export function CardinalDirections() { | ||
| const { t } = useTranslation('panel-nightsky', { | ||
| keyPrefix: 'markings.cardinal-directions' | ||
| }); | ||
|
|
||
| const [sizeToggleValue, setSizeToggle] = useState<'small' | 'large' | undefined>( | ||
| undefined | ||
| ); | ||
|
|
||
| const luaApi = useOpenSpaceApi(); | ||
|
|
||
| const [texture] = useProperty( | ||
| 'StringProperty', | ||
| 'Scene.CardinalDirectionSphere.Renderable.Texture' | ||
| ); | ||
|
|
||
| const isTextureOn = useCallback( | ||
| (variant: keyof typeof Data): boolean => { | ||
| if (!texture) { | ||
| return false; | ||
| } | ||
| return texture.includes(Data[variant].textureCheck); | ||
| }, | ||
| [texture] | ||
| ); | ||
|
|
||
| const currentToggle = useCallback((): 'small' | 'large' | undefined => { | ||
| if (isTextureOn('small')) { | ||
| return 'small'; | ||
| } | ||
| if (isTextureOn('large')) { | ||
| return 'large'; | ||
| } | ||
| return undefined; | ||
| }, [isTextureOn]); | ||
|
|
||
| useEffect(() => { | ||
| if (texture) { | ||
| setSizeToggle(currentToggle()); | ||
| } | ||
| }, [texture, setSizeToggle, currentToggle]); | ||
|
|
||
| function sizeToggleLabel(text: string, icon: React.JSX.Element) { | ||
| return ( | ||
| <Stack gap={0} py={2} align={'center'}> | ||
| {icon} | ||
| <Text>{text}</Text> | ||
| </Stack> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <Skeleton visible={!texture}> | ||
| <Group> | ||
| <Box w={100}> | ||
| <SceneGraphNodeToggle | ||
| title={t('buttons.directions')} | ||
| icon={<CompassSmallIcon size={IconSize.sm} />} | ||
| identifier={'CardinalDirectionSphere'} | ||
| /> | ||
| </Box> | ||
|
|
||
| <SegmentedControl | ||
| onChange={(value: string) => { | ||
| switch (value) { | ||
| case 'small': | ||
| luaApi?.action.triggerAction(Data['small'].showAction); | ||
| if (isTextureOn('marks')) { | ||
| // The action for showing the small letters also hides the marks, so we | ||
| // need to show them again if they were enabled before | ||
| luaApi?.action.triggerAction(Data['marks'].showAction); | ||
| } | ||
| setSizeToggle('small'); | ||
| break; | ||
| case 'large': | ||
| luaApi?.action.triggerAction(Data['large'].showAction); | ||
| if (isTextureOn('marks')) { | ||
| // The action for showing the large letters also hides the marks, so we | ||
| // need to show them again if they were enabled before | ||
| luaApi?.action.triggerAction(Data['marks'].showAction); | ||
| } | ||
| setSizeToggle('large'); | ||
| break; | ||
| default: | ||
| setSizeToggle(undefined); | ||
| break; | ||
| } | ||
| }} | ||
|
Comment on lines
+107
to
+131
Member
There was a problem hiding this comment. Should this be its own function instead? |
||
| value={sizeToggleValue} | ||
| data={[ | ||
| { | ||
| value: 'small', | ||
| label: sizeToggleLabel( | ||
| t('buttons.small'), | ||
| <LetterASmallIcon size={IconSize.sm} /> | ||
| ) | ||
| }, | ||
| { | ||
| value: 'large', | ||
| label: sizeToggleLabel( | ||
| t('buttons.large'), | ||
| <LetterAIcon size={IconSize.sm} /> | ||
| ) | ||
| } | ||
| ]} | ||
| aria-label={t('aria-labels.toggle')} | ||
| /> | ||
| <Switch | ||
| checked={isTextureOn('marks')} | ||
| onChange={(event) => | ||
| luaApi?.action.triggerAction( | ||
| event.target.checked ? Data['marks'].showAction : Data['marks'].hideAction | ||
| ) | ||
|
Comment on lines
+153
to
+156
Member
There was a problem hiding this comment. Should be wrapped with in a function body right? |
||
| } | ||
| label={t('buttons.marks')} | ||
| aria-label={t('aria-labels.marks')} | ||
| /> | ||
| </Group> | ||
| </Skeleton> | ||
| ); | ||
| } | ||
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.
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.