Renamed @theatre/dataverse-react to @theatre/react

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',
 ]
 

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",

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 {

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'
 

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'

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'

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",

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",

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'
 

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'

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'

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'

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'

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'

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'

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<{

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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'

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"]

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"]
     },

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