ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mistakes in merge commit

Browse Source
This commit is contained in:
Frank Noirot
2024-05-28 18:12:27 -04:00
parent f5bb011cb7
commit c140a038c8
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Toolbar.tsx
View File

@ -16,6 +16,7 @@ export function Toolbar({
...props
}: React.HTMLAttributes<HTMLElement>) {
const { state, send, context } = useModelingContext()
const { commandBarSend } = useCommandsContext()
const shouldDisableModelingActions = useShouldDisableModelingActions()
useInteractionMap(
[
@ -41,7 +42,6 @@ export function Toolbar({
],
[shouldDisableModelingActions, commandBarSend, state]
)
const { commandBarSend } = useCommandsContext()
const iconClassName =
'group-disabled:text-chalkboard-50 group-enabled:group-hover:!text-primary dark:group-enabled:group-hover:!text-inherit group-pressed:!text-chalkboard-10 group-ui-open:!text-chalkboard-10 dark:group-ui-open:!text-chalkboard-10'
const bgClassName =
@ -60,14 +60,13 @@ export function Toolbar({
const toolbarButtonsRef = useRef<HTMLUListElement>(null)
useHotkeys(
'l',
() =>
state.matches('Sketch.Line tool')
? send('CancelSketch')
: send('Equip Line tool'),
{ enabled: !disableAllButtons, scopes: ['sketch'] }
{ enabled: !shouldDisableModelingActions, scopes: ['sketch'] }
)
useHotkeys(
'a',
@ -75,7 +74,7 @@ export function Toolbar({
state.matches('Sketch.Tangential arc to')
? send('CancelSketch')
: send('Equip tangential arc to'),
{ enabled: !disableAllButtons, scopes: ['sketch'] }
{ enabled: !shouldDisableModelingActions, scopes: ['sketch'] }
)
useHotkeys(
'r',
@ -83,7 +82,7 @@ export function Toolbar({
state.matches('Sketch.Rectangle tool')
? send('CancelSketch')
: send('Equip rectangle tool'),
{ enabled: !disableAllButtons, scopes: ['sketch'] }
{ enabled: !shouldDisableModelingActions, scopes: ['sketch'] }
)
useHotkeys(
's',
@ -91,7 +90,7 @@ export function Toolbar({
state.nextEvents.includes('Enter sketch') && pathId
? send({ type: 'Enter sketch' })
: send({ type: 'Enter sketch', data: { forceNewSketch: true } }),
{ enabled: !disableAllButtons, scopes: ['modeling'] }
{ enabled: !shouldDisableModelingActions, scopes: ['modeling'] }
)
useHotkeys(
'esc',
@ -99,7 +98,7 @@ export function Toolbar({
state.matches('Sketch.SketchIdle')
? send('Cancel')
: send('CancelSketch'),
{ enabled: !disableAllButtons, scopes: ['sketch'] }
{ enabled: !shouldDisableModelingActions, scopes: ['sketch'] }
)
useHotkeys(
'e',
@ -108,7 +107,7 @@ export function Toolbar({
type: 'Find and select command',
data: { name: 'Extrude', ownerMachine: 'modeling' },
}),
{ enabled: !disableAllButtons, scopes: ['modeling'] }
{ enabled: !shouldDisableModelingActions, scopes: ['modeling'] }
)
function handleToolbarButtonsWheelEvent(ev: WheelEvent<HTMLSpanElement>) {
@ -151,7 +150,7 @@ export function Toolbar({
disabled:
!nextEvents
.filter((event) => state.can(event as any))
.includes(eventName) || disableAllButtons,
.includes(eventName) || shouldDisableModelingActions,
})),
[JSON.stringify(nextEvents), state]

2
src/components/SettingsAuthProvider.tsx
View File

@ -188,6 +188,8 @@ export const SettingsAuthProviderBase = ({
if (settingsState.context.commandBar.includeSettings.current === false)
return
console.log('settingsState', settingsState)
const commands = settingsWithCommandConfigs(settingsState.context)
.map((type) =>
createSettingsCommand({

3
src/lib/cameraControls.ts
View File

@ -119,7 +119,8 @@ export const cameraMouseDragGuards: Record<CameraSystem, MouseGuard> = {
},
rotate: {
description: 'Left click + Alt + drag',
callback: (e) => buttonName(e).left && e.altKey && !e.shiftKey && !e.metaKey,
callback: (e) =>
buttonName(e).left && e.altKey && !e.shiftKey && !e.metaKey,
lenientDragStartButton: 0,
},
},