variablelab/theatre
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

API tweaks

Browse source
This commit is contained in:
Aria Minaei 2021-09-03 19:29:21 +02:00
parent 58e46620cc
commit 9955730876
4 changed files with 44 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/playground/src/dom/Scene.tsx
View file

@ -2,7 +2,7 @@ import studio from '@theatre/studio'
import type {UseDragOpts} from '@theatre/studio/uiComponents/useDrag'
import useDrag from '@theatre/studio/uiComponents/useDrag'
import React, {useLayoutEffect, useMemo, useState} from 'react'
import type {IProject, ISheet, ISheetObject} from '@theatre/core'
import type {IProject, ISheet} from '@theatre/core'
import {types as t} from '@theatre/core'
import type {IScrub, IStudio} from '@theatre/studio'
@ -16,7 +16,7 @@ const boxObjectConfig = t.compound({
const Box: React.FC<{
id: string
sheet: ISheet
selection: ISheetObject[]
selection: IStudio['selection']
}> = ({id, sheet, selection}) => {
// This is cheap to call and always returns the same value, so no need for useMemo()
const obj = sheet.object(id, boxObjectConfig)

4
packages/playground/src/redesign/Scene.tsx
View file

@ -2,7 +2,7 @@ import type {UseDragOpts} from '@theatre/studio/uiComponents/useDrag'
import useDrag from '@theatre/studio/uiComponents/useDrag'
import React, {useLayoutEffect, useMemo, useState} from 'react'
import studio from '@theatre/studio'
import type {IProject, ISheet, ISheetObject} from '@theatre/core'
import type {IProject, ISheet} from '@theatre/core'
import {types as t} from '@theatre/core'
import type {IScrub, IStudio} from '@theatre/studio'
@ -29,7 +29,7 @@ const boxObjectConfig = t.compound({
const Box: React.FC<{
id: string
sheet: ISheet
selection: ISheetObject[]
selection: IStudio['selection']
}> = ({id, sheet, selection: selection}) => {
// This is cheap to call and always returns the same value, so no need for useMemo()
const obj = sheet.object('object ' + id, boxObjectConfig)

11
packages/plugin-r3f/src/components/useSelected.tsx
View file

@ -2,6 +2,7 @@ import {useLayoutEffect, useRef, useState} from 'react'
import {useEditorStore} from '../store'
import shallow from 'zustand/shallow'
import studio from '@theatre/studio'
import type {ISheetObject} from '@theatre/core'
export function useSelected(): undefined | string {
const [state, set] = useState<string | undefined>(undefined)
@ -12,7 +13,10 @@ export function useSelected(): undefined | string {
useLayoutEffect(() => {
const setFromStudio = (selection: typeof studio.selection) => {
const item = selection.find((s) => s.sheet === sheet)
const item = selection.find(
(s): s is ISheetObject =>
s.type === 'Theatre_SheetObject_PublicAPI' && s.sheet === sheet,
)
if (!item) {
set(undefined)
} else {
@ -29,7 +33,10 @@ export function useSelected(): undefined | string {
export function getSelected(): undefined | string {
const sheet = useEditorStore.getState().sheet
if (!sheet) return undefined
const item = studio.selection.find((s) => s.sheet === sheet)
const item = studio.selection.find(
(s): s is ISheetObject =>
s.type === 'Theatre_SheetObject_PublicAPI' && s.sheet === sheet,
)
if (!item) {
return undefined
} else {