diff --git a/devEnv/deploy.mjs b/devEnv/deploy.mjs index d75498e..8c9957b 100644 --- a/devEnv/deploy.mjs +++ b/devEnv/deploy.mjs @@ -11,7 +11,7 @@ import {keyBy} from 'lodash-es' const packagesToBuild = [ 'theatre', '@theatre/dataverse', - '@theatre/dataverse-react', + '@theatre/react', '@theatre/plugin-r3f', ] @@ -19,7 +19,7 @@ const packagesToPublish = [ '@theatre/core', '@theatre/studio', '@theatre/dataverse', - '@theatre/dataverse-react', + '@theatre/react', '@theatre/plugin-r3f', ] @@ -32,7 +32,7 @@ const packagesWhoseVersionsShouldBump = [ 'theatre/core', 'theatre/studio', 'packages/dataverse', - 'packages/dataverse-react', + 'packages/react', 'packages/plugin-r3f', ] diff --git a/packages/plugin-r3f/package.json b/packages/plugin-r3f/package.json index cec0fbe..b7d1666 100644 --- a/packages/plugin-r3f/package.json +++ b/packages/plugin-r3f/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@react-three/drei": "^7.3.1", - "@theatre/dataverse-react": "workspace:*", + "@theatre/react": "workspace:*", "lodash-es": "^4.17.21", "polished": "^4.1.3", "react-icons": "^4.2.0", diff --git a/packages/plugin-r3f/src/components/EditableProxy.tsx b/packages/plugin-r3f/src/components/EditableProxy.tsx index 71991dc..c5d7118 100644 --- a/packages/plugin-r3f/src/components/EditableProxy.tsx +++ b/packages/plugin-r3f/src/components/EditableProxy.tsx @@ -23,7 +23,7 @@ import { import type {IconType} from 'react-icons' import studio from '@theatre/studio' import {useSelected} from './useSelected' -import {useVal} from '@theatre/dataverse-react' +import {useVal} from '@theatre/react' import {getEditorSheetObject} from './editorStuff' export interface EditableProxyProps { diff --git a/packages/plugin-r3f/src/components/ProxyManager.tsx b/packages/plugin-r3f/src/components/ProxyManager.tsx index ad26599..d8d8918 100644 --- a/packages/plugin-r3f/src/components/ProxyManager.tsx +++ b/packages/plugin-r3f/src/components/ProxyManager.tsx @@ -18,7 +18,7 @@ import studio from '@theatre/studio' import type {ISheetObject} from '@theatre/core' import type {$FixMe} from '../types' import {useSelected} from './useSelected' -import {useVal} from '@theatre/dataverse-react' +import {useVal} from '@theatre/react' import useInvalidate from './useInvalidate' import {getEditorSheetObject} from './editorStuff' diff --git a/packages/plugin-r3f/src/components/SnapshotEditor.tsx b/packages/plugin-r3f/src/components/SnapshotEditor.tsx index d9d39a4..494152c 100644 --- a/packages/plugin-r3f/src/components/SnapshotEditor.tsx +++ b/packages/plugin-r3f/src/components/SnapshotEditor.tsx @@ -7,7 +7,7 @@ import shallow from 'zustand/shallow' import root from 'react-shadow/styled-components' import ProxyManager from './ProxyManager' import studio, {ToolbarIconButton} from '@theatre/studio' -import {useVal} from '@theatre/dataverse-react' +import {useVal} from '@theatre/react' import styled, {createGlobalStyle, StyleSheetManager} from 'styled-components' import {IoCameraReverseOutline} from 'react-icons/all' import type {ISheet} from '@theatre/core' diff --git a/packages/plugin-r3f/src/components/Toolbar/Toolbar.tsx b/packages/plugin-r3f/src/components/Toolbar/Toolbar.tsx index 8b6c13e..3d98227 100644 --- a/packages/plugin-r3f/src/components/Toolbar/Toolbar.tsx +++ b/packages/plugin-r3f/src/components/Toolbar/Toolbar.tsx @@ -2,7 +2,7 @@ import type {VFC} from 'react' import React from 'react' import {IoCameraOutline} from 'react-icons/all' import studio, {ToolbarIconButton} from '@theatre/studio' -import {useVal} from '@theatre/dataverse-react' +import {useVal} from '@theatre/react' import TransformControlsModeSelect from './TransformControlsModeSelect' import ViewportShadingSelect from './ViewportShadingSelect' import TransformControlsSpaceSelect from './TransformControlsSpaceSelect' diff --git a/packages/dataverse-react/.gitignore b/packages/react/.gitignore similarity index 100% rename from packages/dataverse-react/.gitignore rename to packages/react/.gitignore diff --git a/packages/dataverse-react/LICENSE b/packages/react/LICENSE similarity index 100% rename from packages/dataverse-react/LICENSE rename to packages/react/LICENSE diff --git a/packages/dataverse-react/devEnv/build.ts b/packages/react/devEnv/build.ts similarity index 100% rename from packages/dataverse-react/devEnv/build.ts rename to packages/react/devEnv/build.ts diff --git a/packages/dataverse-react/devEnv/tsconfig.json b/packages/react/devEnv/tsconfig.json similarity index 100% rename from packages/dataverse-react/devEnv/tsconfig.json rename to packages/react/devEnv/tsconfig.json diff --git a/packages/dataverse-react/package.json b/packages/react/package.json similarity index 93% rename from packages/dataverse-react/package.json rename to packages/react/package.json index 30a6d7d..326d388 100644 --- a/packages/dataverse-react/package.json +++ b/packages/react/package.json @@ -1,5 +1,5 @@ { - "name": "@theatre/dataverse-react", + "name": "@theatre/react", "version": "0.4.0-dev.14", "license": "Apache-2.0", "author": { @@ -10,7 +10,7 @@ "repository": { "type": "git", "url": "https://github.com/AriaMinaei/theatre", - "directory": "packages/dataverse-react" + "directory": "packages/react" }, "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/dataverse-react/src/index.ts b/packages/react/src/index.ts similarity index 100% rename from packages/dataverse-react/src/index.ts rename to packages/react/src/index.ts diff --git a/packages/dataverse-react/tsconfig.json b/packages/react/tsconfig.json similarity index 100% rename from packages/dataverse-react/tsconfig.json rename to packages/react/tsconfig.json diff --git a/theatre/package.json b/theatre/package.json index 1d71a16..718823c 100644 --- a/theatre/package.json +++ b/theatre/package.json @@ -25,7 +25,7 @@ "@rollup/plugin-typescript": "^8.2.5", "@theatre/core": "workspace:*", "@theatre/dataverse": "workspace:*", - "@theatre/dataverse-react": "workspace:*", + "@theatre/react": "workspace:*", "@types/fs-extra": "^9.0.11", "@types/jest": "^26.0.23", "@types/lodash": "^4.14.170", diff --git a/theatre/studio/src/UIRoot/PanelsRoot.tsx b/theatre/studio/src/UIRoot/PanelsRoot.tsx index 6d13c61..a1f62cb 100644 --- a/theatre/studio/src/UIRoot/PanelsRoot.tsx +++ b/theatre/studio/src/UIRoot/PanelsRoot.tsx @@ -2,7 +2,7 @@ import OutlinePanel from '@theatre/studio/panels/OutlinePanel/OutlinePanel' import DetailPanel from '@theatre/studio/panels/DetailPanel/DetailPanel' import React from 'react' import getStudio from '@theatre/studio/getStudio' -import {useVal} from '@theatre/dataverse-react' +import {useVal} from '@theatre/react' import PaneWrapper from '@theatre/studio/panels/BasePanel/PaneWrapper' import SequenceEditorPanel from '@theatre/studio/panels/SequenceEditorPanel/SequenceEditorPanel' diff --git a/theatre/studio/src/UIRoot/UIRoot.tsx b/theatre/studio/src/UIRoot/UIRoot.tsx index 2e980ed..03503b1 100644 --- a/theatre/studio/src/UIRoot/UIRoot.tsx +++ b/theatre/studio/src/UIRoot/UIRoot.tsx @@ -1,5 +1,5 @@ import getStudio from '@theatre/studio/getStudio' -import {usePrism, useVal} from '@theatre/dataverse-react' +import {usePrism, useVal} from '@theatre/react' import {val} from '@theatre/dataverse' import React, {useEffect} from 'react' import styled, {createGlobalStyle, StyleSheetManager} from 'styled-components' diff --git a/theatre/studio/src/panels/BasePanel/BasePanel.tsx b/theatre/studio/src/panels/BasePanel/BasePanel.tsx index 480b029..9a76ad4 100644 --- a/theatre/studio/src/panels/BasePanel/BasePanel.tsx +++ b/theatre/studio/src/panels/BasePanel/BasePanel.tsx @@ -1,5 +1,5 @@ import {val} from '@theatre/dataverse' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {$IntentionalAny, VoidFn} from '@theatre/shared/utils/types' import getStudio from '@theatre/studio/getStudio' import type {PanelPosition} from '@theatre/studio/store/types' diff --git a/theatre/studio/src/panels/DetailPanel/DetailPanel.tsx b/theatre/studio/src/panels/DetailPanel/DetailPanel.tsx index f64eddc..cb100bd 100644 --- a/theatre/studio/src/panels/DetailPanel/DetailPanel.tsx +++ b/theatre/studio/src/panels/DetailPanel/DetailPanel.tsx @@ -1,5 +1,5 @@ import {getOutlineSelection} from '@theatre/studio/selectors' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import React from 'react' import styled from 'styled-components' import {isProject, isSheetObject} from '@theatre/shared/instanceTypes' diff --git a/theatre/studio/src/panels/DetailPanel/ProjectDetails/StateConflictRow.tsx b/theatre/studio/src/panels/DetailPanel/ProjectDetails/StateConflictRow.tsx index 2c51a7e..14eb8af 100644 --- a/theatre/studio/src/panels/DetailPanel/ProjectDetails/StateConflictRow.tsx +++ b/theatre/studio/src/panels/DetailPanel/ProjectDetails/StateConflictRow.tsx @@ -1,4 +1,4 @@ -import {useVal} from '@theatre/dataverse-react' +import {useVal} from '@theatre/react' import getStudio from '@theatre/studio/getStudio' import React from 'react' import styled from 'styled-components' diff --git a/theatre/studio/src/panels/DetailPanel/propEditors/CompoundPropEditor.tsx b/theatre/studio/src/panels/DetailPanel/propEditors/CompoundPropEditor.tsx index ef5b52d..8fe7c29 100644 --- a/theatre/studio/src/panels/DetailPanel/propEditors/CompoundPropEditor.tsx +++ b/theatre/studio/src/panels/DetailPanel/propEditors/CompoundPropEditor.tsx @@ -1,7 +1,7 @@ import type {PropTypeConfig_Compound} from '@theatre/core/propTypes' import {isPropConfigComposite} from '@theatre/shared/propTypes/utils' import type SheetObject from '@theatre/core/sheetObjects/SheetObject' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {$IntentionalAny} from '@theatre/shared/utils/types' import {getPointerParts} from '@theatre/dataverse' import last from 'lodash-es/last' diff --git a/theatre/studio/src/panels/DetailPanel/propEditors/utils/useEditingToolsForPrimitiveProp.tsx b/theatre/studio/src/panels/DetailPanel/propEditors/utils/useEditingToolsForPrimitiveProp.tsx index 97984c0..a7eaea1 100644 --- a/theatre/studio/src/panels/DetailPanel/propEditors/utils/useEditingToolsForPrimitiveProp.tsx +++ b/theatre/studio/src/panels/DetailPanel/propEditors/utils/useEditingToolsForPrimitiveProp.tsx @@ -4,7 +4,7 @@ import getStudio from '@theatre/studio/getStudio' import type Scrub from '@theatre/studio/Scrub' import type {IContextMenuItem} from '@theatre/studio/uiComponents/simpleContextMenu/useContextMenu' import getDeep from '@theatre/shared/utils/getDeep' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {$FixMe, SerializablePrimitive} from '@theatre/shared/utils/types' import {getPointerParts, prism, val} from '@theatre/dataverse' import get from 'lodash-es/get' diff --git a/theatre/studio/src/panels/OutlinePanel/ObjectsList/ObjectItem.tsx b/theatre/studio/src/panels/OutlinePanel/ObjectsList/ObjectItem.tsx index b2a0780..a7823fd 100644 --- a/theatre/studio/src/panels/OutlinePanel/ObjectsList/ObjectItem.tsx +++ b/theatre/studio/src/panels/OutlinePanel/ObjectsList/ObjectItem.tsx @@ -2,7 +2,7 @@ import type SheetObject from '@theatre/core/sheetObjects/SheetObject' import getStudio from '@theatre/studio/getStudio' import React from 'react' import BaseItem from '@theatre/studio/panels/OutlinePanel/BaseItem' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import {getOutlineSelection} from '@theatre/studio/selectors' export const ObjectItem: React.FC<{ diff --git a/theatre/studio/src/panels/OutlinePanel/ObjectsList/ObjectsList.tsx b/theatre/studio/src/panels/OutlinePanel/ObjectsList/ObjectsList.tsx index 22dd6a5..6b9a17b 100644 --- a/theatre/studio/src/panels/OutlinePanel/ObjectsList/ObjectsList.tsx +++ b/theatre/studio/src/panels/OutlinePanel/ObjectsList/ObjectsList.tsx @@ -1,5 +1,5 @@ import type Sheet from '@theatre/core/sheets/Sheet' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import {val} from '@theatre/dataverse' import React from 'react' import styled from 'styled-components' diff --git a/theatre/studio/src/panels/OutlinePanel/OutlinePanel.tsx b/theatre/studio/src/panels/OutlinePanel/OutlinePanel.tsx index 9dae867..45acdbc 100644 --- a/theatre/studio/src/panels/OutlinePanel/OutlinePanel.tsx +++ b/theatre/studio/src/panels/OutlinePanel/OutlinePanel.tsx @@ -5,7 +5,7 @@ import ProjectsList from './ProjectsList/ProjectsList' import {pointerEventsAutoInNormalMode} from '@theatre/studio/css' import ToolbarIconButton from '@theatre/studio/uiComponents/toolbar/ToolbarIconButton' import {VscListTree} from 'react-icons/all' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import getStudio from '@theatre/studio/getStudio' import {val} from '@theatre/dataverse' import useTooltip from '@theatre/studio/uiComponents/Popover/useTooltip' diff --git a/theatre/studio/src/panels/OutlinePanel/ProjectsList/ProjectListItem.tsx b/theatre/studio/src/panels/OutlinePanel/ProjectsList/ProjectListItem.tsx index ea38b9e..747197f 100644 --- a/theatre/studio/src/panels/OutlinePanel/ProjectsList/ProjectListItem.tsx +++ b/theatre/studio/src/panels/OutlinePanel/ProjectsList/ProjectListItem.tsx @@ -3,7 +3,7 @@ import React, {useCallback} from 'react' import BaseItem from '@theatre/studio/panels/OutlinePanel/BaseItem' import SheetsList from '@theatre/studio/panels/OutlinePanel/SheetsList/SheetsList' import getStudio from '@theatre/studio/getStudio' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import {getOutlineSelection} from '@theatre/studio/selectors' import {val} from '@theatre/dataverse' import styled from 'styled-components' diff --git a/theatre/studio/src/panels/OutlinePanel/ProjectsList/ProjectsList.tsx b/theatre/studio/src/panels/OutlinePanel/ProjectsList/ProjectsList.tsx index 536603f..2b0dbaf 100644 --- a/theatre/studio/src/panels/OutlinePanel/ProjectsList/ProjectsList.tsx +++ b/theatre/studio/src/panels/OutlinePanel/ProjectsList/ProjectsList.tsx @@ -1,5 +1,5 @@ import {val} from '@theatre/dataverse' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import getStudio from '@theatre/studio/getStudio' import React from 'react' import styled from 'styled-components' diff --git a/theatre/studio/src/panels/OutlinePanel/SheetsList/SheetInstanceItem.tsx b/theatre/studio/src/panels/OutlinePanel/SheetsList/SheetInstanceItem.tsx index 97a5bef..f5ecc96 100644 --- a/theatre/studio/src/panels/OutlinePanel/SheetsList/SheetInstanceItem.tsx +++ b/theatre/studio/src/panels/OutlinePanel/SheetsList/SheetInstanceItem.tsx @@ -1,6 +1,6 @@ import getStudio from '@theatre/studio/getStudio' import {getOutlineSelection} from '@theatre/studio/selectors' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import React, {useCallback} from 'react' import styled from 'styled-components' import ObjectsList from '@theatre/studio/panels/OutlinePanel/ObjectsList/ObjectsList' diff --git a/theatre/studio/src/panels/OutlinePanel/SheetsList/SheetItem.tsx b/theatre/studio/src/panels/OutlinePanel/SheetsList/SheetItem.tsx index 8ec6f62..64cb1a6 100644 --- a/theatre/studio/src/panels/OutlinePanel/SheetsList/SheetItem.tsx +++ b/theatre/studio/src/panels/OutlinePanel/SheetsList/SheetItem.tsx @@ -1,6 +1,6 @@ import type Project from '@theatre/core/projects/Project' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import {val} from '@theatre/dataverse' import React from 'react' import styled from 'styled-components' diff --git a/theatre/studio/src/panels/OutlinePanel/SheetsList/SheetsList.tsx b/theatre/studio/src/panels/OutlinePanel/SheetsList/SheetsList.tsx index 01d2674..1be45f8 100644 --- a/theatre/studio/src/panels/OutlinePanel/SheetsList/SheetsList.tsx +++ b/theatre/studio/src/panels/OutlinePanel/SheetsList/SheetsList.tsx @@ -1,5 +1,5 @@ import {getRegisteredSheetIds} from '@theatre/studio/selectors' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import React from 'react' import {SheetItem} from './SheetItem' import type Project from '@theatre/core/projects/Project' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/DopeSheet.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/DopeSheet.tsx index 426047c..96821b5 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/DopeSheet.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/DopeSheet.tsx @@ -1,4 +1,4 @@ -import {useVal} from '@theatre/dataverse-react' +import {useVal} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import React from 'react' import styled from 'styled-components' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/Left.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/Left.tsx index 02d170e..6a2f3ae 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/Left.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/Left.tsx @@ -1,5 +1,5 @@ import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import {val} from '@theatre/dataverse' import React from 'react' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/PrimitivePropRow.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/PrimitivePropRow.tsx index 4efb8c8..7e01856 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/PrimitivePropRow.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/PrimitivePropRow.tsx @@ -2,7 +2,7 @@ import type {SequenceEditorTree_PrimitiveProp} from '@theatre/studio/panels/Sequ import getStudio from '@theatre/studio/getStudio' import {encodePathToProp} from '@theatre/shared/utils/addresses' import pointerDeep from '@theatre/shared/utils/pointerDeep' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {$IntentionalAny} from '@theatre/shared/utils/types' import type {Pointer} from '@theatre/dataverse' import {val} from '@theatre/dataverse' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/PropWithChildrenRow.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/PropWithChildrenRow.tsx index 7efc321..d357f05 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/PropWithChildrenRow.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/PropWithChildrenRow.tsx @@ -2,7 +2,7 @@ import type { SequenceEditorTree_PrimitiveProp, SequenceEditorTree_PropWithChildren, } from '@theatre/studio/panels/SequenceEditorPanel/layout/tree' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import React from 'react' import styled from 'styled-components' import AnyCompositeRow from './AnyCompositeRow' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/SheetObjectRow.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/SheetObjectRow.tsx index 1779c3a..50cf338 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/SheetObjectRow.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/SheetObjectRow.tsx @@ -1,5 +1,5 @@ import type {SequenceEditorTree_SheetObject} from '@theatre/studio/panels/SequenceEditorPanel/layout/tree' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import React from 'react' import styled from 'styled-components' import CompoundRow from './AnyCompositeRow' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/SheetRow.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/SheetRow.tsx index 922337a..9290cab 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/SheetRow.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Left/SheetRow.tsx @@ -1,5 +1,5 @@ import type {SequenceEditorTree_Sheet} from '@theatre/studio/panels/SequenceEditorPanel/layout/tree' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import React from 'react' import styled from 'styled-components' import SheetObjectRow from './SheetObjectRow' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/BasicKeyframedTrack/BasicKeyframedTrack.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/BasicKeyframedTrack/BasicKeyframedTrack.tsx index ea1e38c..75281af 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/BasicKeyframedTrack/BasicKeyframedTrack.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/BasicKeyframedTrack/BasicKeyframedTrack.tsx @@ -1,7 +1,7 @@ import type {TrackData} from '@theatre/core/projects/store/types/SheetState_Historic' import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout' import type {SequenceEditorTree_PrimitiveProp} from '@theatre/studio/panels/SequenceEditorPanel/layout/tree' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import {val} from '@theatre/dataverse' import React from 'react' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/DopeSheetBackground.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/DopeSheetBackground.tsx index 3edf394..1269ca0 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/DopeSheetBackground.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/DopeSheetBackground.tsx @@ -1,7 +1,7 @@ import {theme} from '@theatre/studio/css' import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout' import {zIndexes} from '@theatre/studio/panels/SequenceEditorPanel/SequenceEditorPanel' -import {useVal} from '@theatre/dataverse-react' +import {useVal} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import {darken, transparentize} from 'polished' import React from 'react' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/DopeSheetSelectionView.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/DopeSheetSelectionView.tsx index 1282af0..3b24f93 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/DopeSheetSelectionView.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/DopeSheetSelectionView.tsx @@ -5,7 +5,7 @@ import useKeyDown from '@theatre/studio/uiComponents/useKeyDown' import useValToAtom from '@theatre/studio/uiComponents/useValToAtom' import mutableSetDeep from '@theatre/shared/utils/mutableSetDeep' import useRefAndState from '@theatre/studio/utils/useRefAndState' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {$IntentionalAny} from '@theatre/shared/utils/types' import type {Pointer} from '@theatre/dataverse' import {val} from '@theatre/dataverse' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/HorizontallyScrollableArea.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/HorizontallyScrollableArea.tsx index b3a2e53..8a62e82 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/HorizontallyScrollableArea.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/HorizontallyScrollableArea.tsx @@ -2,7 +2,7 @@ import type Sequence from '@theatre/core/sequences/Sequence' import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout' import useDrag from '@theatre/studio/uiComponents/useDrag' import useRefAndState from '@theatre/studio/utils/useRefAndState' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import {prism, val} from '@theatre/dataverse' import {clamp, mapValues} from 'lodash-es' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/LengthIndicator/LengthEditorPopover.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/LengthIndicator/LengthEditorPopover.tsx index 7f260d3..8ff691e 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/LengthIndicator/LengthEditorPopover.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/LengthIndicator/LengthEditorPopover.tsx @@ -2,7 +2,7 @@ import type {Pointer} from '@theatre/dataverse' import React, {useLayoutEffect, useMemo, useRef} from 'react' import styled from 'styled-components' import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout' -import {usePrism, useVal} from '@theatre/dataverse-react' +import {usePrism, useVal} from '@theatre/react' import getStudio from '@theatre/studio/getStudio' import type {BasicNumberInputNudgeFn} from '@theatre/studio/uiComponents/form/BasicNumberInput' import BasicNumberInput from '@theatre/studio/uiComponents/form/BasicNumberInput' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/LengthIndicator/LengthIndicator.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/LengthIndicator/LengthIndicator.tsx index 639088e..5780f94 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/LengthIndicator/LengthIndicator.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/LengthIndicator/LengthIndicator.tsx @@ -1,4 +1,4 @@ -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import {val} from '@theatre/dataverse' import React, {useMemo, useRef, useState} from 'react' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/PrimitivePropRow.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/PrimitivePropRow.tsx index 10d6ce0..1c28579 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/PrimitivePropRow.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/PrimitivePropRow.tsx @@ -1,7 +1,7 @@ import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout' import type {SequenceEditorTree_PrimitiveProp} from '@theatre/studio/panels/SequenceEditorPanel/layout/tree' import getStudio from '@theatre/studio/getStudio' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import {val} from '@theatre/dataverse' import React from 'react' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/PropWithChildrenRow.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/PropWithChildrenRow.tsx index 044e84b..12e1d26 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/PropWithChildrenRow.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/PropWithChildrenRow.tsx @@ -3,7 +3,7 @@ import type { SequenceEditorTree_PrimitiveProp, SequenceEditorTree_PropWithChildren, } from '@theatre/studio/panels/SequenceEditorPanel/layout/tree' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import React from 'react' import styled from 'styled-components' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/Right.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/Right.tsx index e0b1cdb..f40d4c8 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/Right.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/Right.tsx @@ -1,6 +1,6 @@ import {theme} from '@theatre/studio/css' import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import {val} from '@theatre/dataverse' import {darken} from 'polished' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/SheetObjectRow.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/SheetObjectRow.tsx index 7989be4..2baa343 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/SheetObjectRow.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/SheetObjectRow.tsx @@ -1,6 +1,6 @@ import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout' import type {SequenceEditorTree_SheetObject} from '@theatre/studio/panels/SequenceEditorPanel/layout/tree' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import React from 'react' import styled from 'styled-components' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/SheetRow.tsx b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/SheetRow.tsx index 837dc7a..e1fa7a0 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/SheetRow.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/SheetRow.tsx @@ -1,6 +1,6 @@ import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout' import type {SequenceEditorTree_Sheet} from '@theatre/studio/panels/SequenceEditorPanel/layout/tree' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import React from 'react' import styled from 'styled-components' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/GraphEditor/GraphEditor.tsx b/theatre/studio/src/panels/SequenceEditorPanel/GraphEditor/GraphEditor.tsx index d4c40b0..5dc659c 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/GraphEditor/GraphEditor.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/GraphEditor/GraphEditor.tsx @@ -2,7 +2,7 @@ import getStudio from '@theatre/studio/getStudio' import {decodePathToProp} from '@theatre/shared/utils/addresses' import getDeep from '@theatre/shared/utils/getDeep' import type {SequenceTrackId} from '@theatre/shared/utils/ids' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import {val} from '@theatre/dataverse' import React from 'react' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/GraphEditor/PrimitivePropGraph.tsx b/theatre/studio/src/panels/SequenceEditorPanel/GraphEditor/PrimitivePropGraph.tsx index c3fc79f..587ed58 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/GraphEditor/PrimitivePropGraph.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/GraphEditor/PrimitivePropGraph.tsx @@ -2,7 +2,7 @@ import type SheetObject from '@theatre/core/sheetObjects/SheetObject' import getStudio from '@theatre/studio/getStudio' import type {PathToProp} from '@theatre/shared/utils/addresses' import type {SequenceTrackId} from '@theatre/shared/utils/ids' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import {val} from '@theatre/dataverse' import React from 'react' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/GraphEditorToggle.tsx b/theatre/studio/src/panels/SequenceEditorPanel/GraphEditorToggle.tsx index 69ce095..8a4612f 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/GraphEditorToggle.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/GraphEditorToggle.tsx @@ -1,6 +1,6 @@ import type {Pointer} from '@theatre/dataverse' import {val} from '@theatre/dataverse' -import {useVal} from '@theatre/dataverse-react' +import {useVal} from '@theatre/react' import getStudio from '@theatre/studio/getStudio' import React, {useCallback} from 'react' import styled from 'styled-components' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/FrameStamp.tsx b/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/FrameStamp.tsx index 46df21c..0a31129 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/FrameStamp.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/FrameStamp.tsx @@ -1,5 +1,5 @@ import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout' -import {usePrism, useVal} from '@theatre/dataverse-react' +import {usePrism, useVal} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import {val} from '@theatre/dataverse' import React from 'react' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/HorizontalScrollbar.tsx b/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/HorizontalScrollbar.tsx index c17fbd8..5c08758 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/HorizontalScrollbar.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/HorizontalScrollbar.tsx @@ -1,6 +1,6 @@ import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout' import DraggableArea from '@theatre/studio/uiComponents/DraggableArea' -import {useVal} from '@theatre/dataverse-react' +import {useVal} from '@theatre/react' import type {IRange} from '@theatre/shared/utils/types' import type {Pointer} from '@theatre/dataverse' import {prism, val} from '@theatre/dataverse' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/Playhead.tsx b/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/Playhead.tsx index 6351dd8..ba0a130 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/Playhead.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/Playhead.tsx @@ -3,7 +3,7 @@ import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEdi import RoomToClick from '@theatre/studio/uiComponents/RoomToClick' import useDrag from '@theatre/studio/uiComponents/useDrag' import useRefAndState from '@theatre/studio/utils/useRefAndState' -import {usePrism, useVal} from '@theatre/dataverse-react' +import {usePrism, useVal} from '@theatre/react' import type {$IntentionalAny} from '@theatre/shared/utils/types' import type {Pointer} from '@theatre/dataverse' import {val} from '@theatre/dataverse' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/RightOverlay.tsx b/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/RightOverlay.tsx index 5200a3e..fdc938f 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/RightOverlay.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/RightOverlay.tsx @@ -1,6 +1,6 @@ import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout' import {zIndexes} from '@theatre/studio/panels/SequenceEditorPanel/SequenceEditorPanel' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import {val} from '@theatre/dataverse' import React from 'react' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/TopStrip.tsx b/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/TopStrip.tsx index 8f8dba1..2dccb50 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/TopStrip.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/TopStrip.tsx @@ -1,4 +1,4 @@ -import {useVal} from '@theatre/dataverse-react' +import {useVal} from '@theatre/react' import type {Pointer} from '@theatre/dataverse' import React from 'react' import styled from 'styled-components' diff --git a/theatre/studio/src/panels/SequenceEditorPanel/SequenceEditorPanel.tsx b/theatre/studio/src/panels/SequenceEditorPanel/SequenceEditorPanel.tsx index e2ab247..21c8466 100644 --- a/theatre/studio/src/panels/SequenceEditorPanel/SequenceEditorPanel.tsx +++ b/theatre/studio/src/panels/SequenceEditorPanel/SequenceEditorPanel.tsx @@ -1,5 +1,5 @@ import {getOutlineSelection} from '@theatre/studio/selectors' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import {valToAtom} from '@theatre/shared/utils/valToAtom' import type {Pointer} from '@theatre/dataverse' import {prism, val} from '@theatre/dataverse' diff --git a/theatre/studio/src/toolbars/GlobalToolbar/GlobalToolbar.tsx b/theatre/studio/src/toolbars/GlobalToolbar/GlobalToolbar.tsx index b305261..1356a20 100644 --- a/theatre/studio/src/toolbars/GlobalToolbar/GlobalToolbar.tsx +++ b/theatre/studio/src/toolbars/GlobalToolbar/GlobalToolbar.tsx @@ -1,4 +1,4 @@ -import {useVal} from '@theatre/dataverse-react' +import {useVal} from '@theatre/react' import {pointerEventsAutoInNormalMode} from '@theatre/studio/css' import getStudio from '@theatre/studio/getStudio' import {panelZIndexes} from '@theatre/studio/panels/BasePanel/common' diff --git a/theatre/studio/src/uiComponents/ShowMousePosition.tsx b/theatre/studio/src/uiComponents/ShowMousePosition.tsx index 032b6d1..56fc72a 100644 --- a/theatre/studio/src/uiComponents/ShowMousePosition.tsx +++ b/theatre/studio/src/uiComponents/ShowMousePosition.tsx @@ -1,5 +1,5 @@ import mousePositionD from '@theatre/studio/utils/mousePositionD' -import {usePrism} from '@theatre/dataverse-react' +import {usePrism} from '@theatre/react' import {val} from '@theatre/dataverse' import React from 'react' import {createPortal} from 'react-dom' diff --git a/theatre/tsconfig.json b/theatre/tsconfig.json index 7fe813c..fc079ac 100644 --- a/theatre/tsconfig.json +++ b/theatre/tsconfig.json @@ -18,7 +18,7 @@ "files": ["./globals.d.ts"], "references": [ {"path": "../packages/dataverse"}, - {"path": "../packages/dataverse-react"} + {"path": "../packages/react"} ], "include": ["./*/src/**/*", "./devEnv/**/*"], "exclude": ["**/node_modules", "**/.*", "**/xeno", "**/dist", "**/.temp"] diff --git a/tsconfig.base.json b/tsconfig.base.json index 1a0f4b2..23102f5 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -22,7 +22,7 @@ "@theatre/core/*": ["./theatre/core/src/*"], "@theatre/shared/*": ["./theatre/shared/src/*"], "@theatre/dataverse": ["./packages/dataverse/src/index.ts"], - "@theatre/dataverse-react": ["./packages/dataverse-react/src/index.ts"], + "@theatre/react": ["./packages/react/src/index.ts"], "@theatre/plugin-r3f": ["./packages/plugin-r3f/src/index.tsx"], "@theatre/dataverse2": ["./packages/dataverse2/src/index.ts"] }, diff --git a/yarn.lock b/yarn.lock index e31e59b..26f530f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5215,28 +5215,6 @@ __metadata: languageName: unknown linkType: soft -"@theatre/dataverse-react@workspace:*, @theatre/dataverse-react@workspace:packages/dataverse-react": - version: 0.0.0-use.local - resolution: "@theatre/dataverse-react@workspace:packages/dataverse-react" - dependencies: - "@theatre/dataverse": "workspace:*" - "@types/jest": ^26.0.23 - "@types/lodash-es": ^4.17.4 - "@types/node": ^15.6.2 - "@types/react": ^17.0.9 - "@types/react-dom": ^17.0.6 - esbuild: ^0.12.15 - esbuild-register: ^2.5.0 - lodash-es: ^4.17.21 - npm-run-all: ^4.1.5 - queue-microtask: ^1.2.3 - typescript: ^4.4.2 - peerDependencies: - raect-dom: "*" - react: "*" - languageName: unknown - linkType: soft - "@theatre/dataverse2@workspace:packages/dataverse2": version: 0.0.0-use.local resolution: "@theatre/dataverse2@workspace:packages/dataverse2" @@ -5270,7 +5248,7 @@ __metadata: resolution: "@theatre/plugin-r3f@workspace:packages/plugin-r3f" dependencies: "@react-three/drei": ^7.3.1 - "@theatre/dataverse-react": "workspace:*" + "@theatre/react": "workspace:*" "@types/jest": ^26.0.23 "@types/lodash-es": ^4.17.4 "@types/node": ^15.6.2 @@ -5297,6 +5275,28 @@ __metadata: languageName: unknown linkType: soft +"@theatre/react@workspace:*, @theatre/react@workspace:packages/react": + version: 0.0.0-use.local + resolution: "@theatre/react@workspace:packages/react" + dependencies: + "@theatre/dataverse": "workspace:*" + "@types/jest": ^26.0.23 + "@types/lodash-es": ^4.17.4 + "@types/node": ^15.6.2 + "@types/react": ^17.0.9 + "@types/react-dom": ^17.0.6 + esbuild: ^0.12.15 + esbuild-register: ^2.5.0 + lodash-es: ^4.17.21 + npm-run-all: ^4.1.5 + queue-microtask: ^1.2.3 + typescript: ^4.4.2 + peerDependencies: + raect-dom: "*" + react: "*" + languageName: unknown + linkType: soft + "@theatre/shared@workspace:theatre/shared": version: 0.0.0-use.local resolution: "@theatre/shared@workspace:theatre/shared" @@ -22674,7 +22674,7 @@ fsevents@^1.2.7: "@rollup/plugin-typescript": ^8.2.5 "@theatre/core": "workspace:*" "@theatre/dataverse": "workspace:*" - "@theatre/dataverse-react": "workspace:*" + "@theatre/react": "workspace:*" "@types/fs-extra": ^9.0.11 "@types/jest": ^26.0.23 "@types/lodash": ^4.14.170