New: Refactored reactDataverse into a package

packages/dataverse-react/.gitignore

@@ -0,0 +1 @@
+/dist

packages/dataverse-react/LICENSE

@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

packages/dataverse-react/devEnv/build.ts

@@ -0,0 +1,35 @@
+import path from 'path'
+import {build} from 'esbuild'
+
+const definedGlobals = {
+  global: 'window',
+}
+
+function createBundles(watch: boolean) {
+  const pathToPackage = path.join(__dirname, '../')
+  const esbuildConfig: Parameters<typeof build>[0] = {
+    entryPoints: [path.join(pathToPackage, 'src/index.ts')],
+    bundle: true,
+    sourcemap: true,
+    define: definedGlobals,
+    watch,
+    platform: 'neutral',
+    mainFields: ['browser', 'module', 'main'],
+    target: ['firefox57', 'chrome58'],
+    conditions: ['browser', 'node'],
+  }
+
+  build({
+    ...esbuildConfig,
+    outfile: path.join(pathToPackage, 'dist/index.cjs'),
+    format: 'cjs',
+  })
+
+  build({
+    ...esbuildConfig,
+    outfile: path.join(pathToPackage, 'dist/index.mjs'),
+    format: 'esm',
+  })
+}
+
+createBundles(false)

packages/dataverse-react/devEnv/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  
+}

packages/dataverse-react/package.json

@@ -0,0 +1,56 @@
+{
+  "name": "@theatre/dataverse-react",
+  "version": "1.0.0-dev.2",
+  "license": "Apache-2.0",
+  "author": {
+    "name": "Aria Minaei",
+    "email": "aria@theatrejs.com",
+    "url": "https://github.com/AriaMinaei"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/AriaMinaei/theatre",
+    "directory": "packages/dataverse-react"
+  },
+  "main": "dist/index.cjs",
+  "types": "dist/index.d.ts",
+  "module": "dist/index.mjs",
+  "exports": {
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.mjs",
+      "default": "./dist/index.cjs",
+      "node": "./dist/index.cjs"
+    }
+  },
+  "files": [
+    "dist/**/*"
+  ],
+  "scripts": {
+    "prepack": "yarn run build",
+    "typecheck": "yarn run build",
+    "build": "run-s build:ts build:js",
+    "build:ts": "tsc --build ./tsconfig.json",
+    "build:js": "node -r esbuild-register ./devEnv/build.ts"
+  },
+  "devDependencies": {
+    "@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.5",
+    "esbuild-register": "^2.5.0",
+    "npm-run-all": "^4.1.5",
+    "typescript": "^4.3.2"
+  },
+  "dependencies": {
+    "lodash-es": "^4.17.21",
+    "queue-microtask": "^1.2.3"
+  },
+  "peerDependencies": {
+    "@theatre/dataverse": "*",
+    "raect-dom": "17.0.2",
+    "react": "17.0.2"
+  }
+}

packages/dataverse-react/src/index.ts

@@ -3,10 +3,33 @@ import {Box} from '@theatre/dataverse'
 import {prism, val} from '@theatre/dataverse'
 import {findIndex} from 'lodash-es'
 import queueMicrotask from 'queue-microtask'
-import {useCallback, useEffect, useLayoutEffect, useMemo, useRef} from 'react'
+import {
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react'
 import {unstable_batchedUpdates} from 'react-dom'
-import {useForceUpdate} from './react/hooks'
+
-import type {$IntentionalAny, VoidFn} from './types'
+type $IntentionalAny = any
+type VoidFn = () => void
+
+const logger = {log: console.log}
+
+function useForceUpdate(debugLabel?: string) {
+  const [, setTick] = useState(0)
+
+  const update = useCallback(() => {
+    if (process.env.NODE_ENV !== 'production' && debugLabel)
+      logger.log(debugLabel, 'forceUpdate', {trace: new Error()})
+
+    setTick((tick) => tick + 1)
+  }, [])
+
+  return update
+}
 
 export function usePrism<T>(
   fn: () => T,

packages/dataverse-react/tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "lib": ["ESNext", "DOM"],
+    "rootDir": "src",
+    "types": ["jest", "node"],
+    "emitDeclarationOnly": true,
+    "target": "es6",
+    "composite": true
+  },
+  "include": ["./src/**/*"],
+  "references": [{"path": "../dataverse"}]
+}

theatre/package.json

@@ -30,6 +30,7 @@
     "@rollup/plugin-typescript": "^8.2.1",
     "@theatre/core": "workspace:*",
     "@theatre/dataverse": "workspace:*",
+    "@theatre/dataverse-react": "workspace:*",
     "@types/fs-extra": "^9.0.11",
     "@types/jest": "^26.0.23",
     "@types/lodash": "^4.14.170",
@@ -68,7 +69,6 @@
     "polished": "^4.1.3",
     "prop-types": "^15.7.2",
     "propose": "^0.0.5",
-    "queue-microtask": "^1.2.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-icons": "^4.2.0",

theatre/studio/package.json

@@ -39,9 +39,6 @@
     "prepublish": "cd .. && yarn run ensure-publishing"
   },
   "sideEffects": true,
-  "dependencies": {
-    "@theatre/dataverse": "workspace:*"
-  },
   "peerDependencies": {
     "@theatre/core": "*"
   }

theatre/studio/src/UIRoot/EnsureProjectsDontHaveErrors.tsx

@@ -1,4 +1,4 @@
-import {usePrism} from '@theatre/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import {val} from '@theatre/dataverse'
 import React from 'react'
 import BrowserStateIsNotBasedOnDiskStateModal from './BrowserStateIsNotBasedOnDiskStateModal'

theatre/studio/src/UIRoot/UIRoot.tsx

@@ -1,6 +1,6 @@
 import getStudio from '@theatre/studio/getStudio'
 import type {Studio} from '@theatre/studio/Studio'
-import {usePrism} from '@theatre/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import {val} from '@theatre/dataverse'
 import React from 'react'
 import {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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import type {$IntentionalAny} from '@theatre/shared/utils/types'
 import getStudio from '@theatre/studio/getStudio'
 import type {PanelId, PanelPosition} from '@theatre/studio/store/types'

theatre/studio/src/panels/ObjectEditorPanel/ObjectEditorPanel.tsx

@@ -1,6 +1,6 @@
 import {theme} from '@theatre/studio/css'
 import {getOutlineSelection} from '@theatre/studio/selectors'
-import {usePrism} from '@theatre/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import {prism} from '@theatre/dataverse'
 import React from 'react'
 import styled from 'styled-components'

theatre/studio/src/panels/ObjectEditorPanel/propEditors/CompoundPropEditor.tsx

@@ -3,7 +3,7 @@ import {isPropConfigComposite} from '@theatre/shared/propTypes/utils'
 import type SheetObject from '@theatre/core/sheetObjects/SheetObject'
 import {theme} from '@theatre/studio/css'
 import {voidFn} from '@theatre/shared/utils'
-import {usePrism} from '@theatre/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import type {$IntentionalAny} from '@theatre/shared/utils/types'
 import {getPointerParts} from '@theatre/dataverse'
 import last from 'lodash-es/last'

theatre/studio/src/panels/ObjectEditorPanel/propEditors/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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import {val} from '@theatre/dataverse'
 import React from 'react'
 import styled from 'styled-components'

theatre/studio/src/panels/OutlinePanel/OutlinePanel.tsx

@@ -1,4 +1,4 @@
-import {usePrism} from '@theatre/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import React from 'react'
 import styled from 'styled-components'
 import ProjectsList from './ProjectsList/ProjectsList'

theatre/studio/src/panels/OutlinePanel/ProjectsList/ProjectListItem.tsx

@@ -4,7 +4,7 @@ import styled from 'styled-components'
 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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import {getOutlineSelection} from '@theatre/studio/selectors'
 
 const Container = styled.li<{depth: number}>`

theatre/studio/src/panels/OutlinePanel/ProjectsList/ProjectsList.tsx

@@ -1,5 +1,5 @@
 import {val} from '@theatre/dataverse'
-import {usePrism} from '@theatre/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import React from 'react'
 import {SheetItem} from './SheetItem'
 import type Project from '@theatre/core/projects/Project'

theatre/studio/src/panels/SequenceEditorPanel/BottomRectangleThingy/BottomRectangleThingy.tsx

@@ -1,6 +1,6 @@
 import type {Pointer} from '@theatre/dataverse'
 import {val} from '@theatre/dataverse'
-import {usePrism} from '@theatre/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import {theme} from '@theatre/studio/css'
 import React from 'react'
 import styled from 'styled-components'

theatre/studio/src/panels/SequenceEditorPanel/BottomRectangleThingy/GraphEditorToggle.tsx

@@ -1,6 +1,6 @@
 import type {Pointer} from '@theatre/dataverse'
 import {val} from '@theatre/dataverse'
-import {useVal} from '@theatre/shared/utils/reactDataverse'
+import {useVal} from '@theatre/dataverse-react'
 import getStudio from '@theatre/studio/getStudio'
 import React, {useCallback} from 'react'
 import styled from 'styled-components'

theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/DopeSheet.tsx

@@ -1,4 +1,4 @@
-import {useVal} from '@theatre/shared/utils/reactDataverse'
+import {useVal} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {useVal} from '@theatre/dataverse-react'
 import type {Pointer} from '@theatre/dataverse'
 import {darken} 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/shared/utils/react/useRefAndState'
-import {usePrism} from '@theatre/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import type {$IntentionalAny} from '@theatre/shared/utils/types'
 import type {Pointer} from '@theatre/dataverse'
 import {val} from '@theatre/dataverse'
@@ -24,8 +24,9 @@ const Container = styled.div<{isShiftDown: boolean}>`
 const DopeSheetSelectionView: React.FC<{
   layoutP: Pointer<SequenceEditorPanelLayout>
 }> = ({layoutP, children}) => {
-  const [containerRef, containerNode] =
+  const [containerRef, containerNode] = useRefAndState<HTMLDivElement | null>(
-    useRefAndState<HTMLDivElement | null>(null)
+    null,
+  )
   const isShiftDown = useKeyDown('Shift')
   const selectionBounds = useCaptureSelection(layoutP, containerNode)
   const selectionBoundsRef = useRef<typeof selectionBounds>(selectionBounds)

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/shared/utils/react/useRefAndState'
-import {usePrism} from '@theatre/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import type {Pointer} from '@theatre/dataverse'
 import {prism, val} from '@theatre/dataverse'
 import {clamp, mapValues} from 'lodash-es'
@@ -45,8 +45,9 @@ const HorizontallyScrollableArea: React.FC<{
     [layoutP],
   )
 
-  const [containerRef, containerNode] =
+  const [containerRef, containerNode] = useRefAndState<HTMLDivElement | null>(
-    useRefAndState<HTMLDivElement | null>(null)
+    null,
+  )
 
   useHandlePanAndZoom(layoutP, containerNode)
   useDragHandlers(layoutP, containerNode)

theatre/studio/src/panels/SequenceEditorPanel/DopeSheet/Right/LengthIndicator.tsx

@@ -1,4 +1,4 @@
-import {usePrism} from '@theatre/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import type {Pointer} from '@theatre/dataverse'
 import {val} from '@theatre/dataverse'
 import React 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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import type {Pointer} from '@theatre/dataverse'
 import {val} from '@theatre/dataverse'
 import React from 'react'

theatre/studio/src/panels/SequenceEditorPanel/RightOverlay/FrameStamp.tsx

@@ -1,6 +1,6 @@
 import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout'
 import mousePositionD from '@theatre/shared/utils/mousePositionD'
-import {usePrism, useVal} from '@theatre/shared/utils/reactDataverse'
+import {usePrism, useVal} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {useVal} from '@theatre/dataverse-react'
 import type {IRange} from '@theatre/shared/utils/types'
 import type {Pointer} from '@theatre/dataverse'
 import {prism, val} from '@theatre/dataverse'
@@ -156,8 +156,9 @@ const HorizontalScrollbar: React.FC<{
   const {rangeStartX, rangeEndX, clippedSpaceRange, bottom} =
     useVal(relevantValuesD)
 
-  const [beingDragged, setBeingDragged] =
+  const [beingDragged, setBeingDragged] = useState<
-    useState<'nothing' | 'both' | 'start' | 'end'>('nothing')
+    'nothing' | 'both' | 'start' | 'end'
+  >('nothing')
 
   const handles = useMemo(() => {
     let valuesBeforeDrag = val(relevantValuesD)

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/shared/utils/react/useRefAndState'
-import {usePrism} from '@theatre/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {useVal} from '@theatre/dataverse-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/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import {valToAtom} from '@theatre/shared/utils/valToAtom'
 import type {Pointer} from '@theatre/dataverse'
 import {prism, val} from '@theatre/dataverse'

theatre/studio/src/uiComponents/ShowMousePosition.tsx

@@ -1,5 +1,5 @@
 import mousePositionD from '@theatre/shared/utils/mousePositionD'
-import {usePrism} from '@theatre/shared/utils/reactDataverse'
+import {usePrism} from '@theatre/dataverse-react'
 import {val} from '@theatre/dataverse'
 import React from 'react'
 import {createPortal} from 'react-dom'

theatre/tsconfig.json

@@ -16,7 +16,10 @@
     ]
   },
   "files": ["./globals.d.ts"],
-  "references": [{"path": "../packages/dataverse"}],
+  "references": [
+    {"path": "../packages/dataverse"},
+    {"path": "../packages/dataverse-react"}
+  ],
   "include": ["./*/src/**/*", "./devEnv/**/*"],
   "exclude": ["**/node_modules", "**/.*", "**/xeno", "**/dist", "**/.temp"]
 }

tsconfig.base.json

@@ -23,6 +23,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/plugin-r3f": ["./packages/plugin-r3f/src/index.tsx"],
       "@theatre/dataverse2": ["./packages/dataverse2/src/index.ts"]
     },

yarn.lock

@@ -3740,6 +3740,28 @@ __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:
+    "@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.5
+    esbuild-register: ^2.5.0
+    lodash-es: ^4.17.21
+    npm-run-all: ^4.1.5
+    queue-microtask: ^1.2.3
+    typescript: ^4.3.2
+  peerDependencies:
+    "@theatre/dataverse": "*"
+    raect-dom: 17.0.2
+    react: 17.0.2
+  languageName: unknown
+  linkType: soft
+
 "@theatre/dataverse2@workspace:packages/dataverse2":
   version: 0.0.0-use.local
   resolution: "@theatre/dataverse2@workspace:packages/dataverse2"
@@ -3776,13 +3798,10 @@ __metadata:
     "@react-three/fiber": ^6.2.2
     "@theatre/core": "workspace:*"
     "@theatre/studio": "workspace:*"
-    "@types/file-saver": ^2.0.2
     "@types/jest": ^26.0.23
     "@types/lodash-es": ^4.17.4
     "@types/node": ^15.6.2
     "@types/react": ^17.0.9
-    fast-deep-equal: ^3.1.3
-    file-saver: ^2.0.5
     lodash-es: ^4.17.21
     prism-react-renderer: 1.2.1
     react: ^17.0.2
@@ -3810,8 +3829,6 @@ __metadata:
 "@theatre/studio@workspace:*, @theatre/studio@workspace:theatre/studio":
   version: 0.0.0-use.local
   resolution: "@theatre/studio@workspace:theatre/studio"
-  dependencies:
-    "@theatre/dataverse": "workspace:*"
   peerDependencies:
     "@theatre/core": "*"
   languageName: unknown
@@ -3907,13 +3924,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/file-saver@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "@types/file-saver@npm:2.0.2"
-  checksum: ccdfbbe45c68b54192d1a9fb9c5f7594c7eabe64ad55982839f0e758b72a62ae0e2edcee16af2b7c197d53f57047b5e11dac5d7805326718d0cb5a5e2f4dc382
-  languageName: node
-  linkType: hard
-
 "@types/fs-extra@npm:^9.0.11":
   version: 9.0.11
   resolution: "@types/fs-extra@npm:9.0.11"
@@ -8644,13 +8654,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"file-saver@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "file-saver@npm:2.0.5"
-  checksum: 0f835236534377c9b7591b995d94ae5061166452fb1f784548b706ff48984930e45a7947cfe393ce86b84ef2ec89064120c5d5ab5186146c508bb022c71ced3d
-  languageName: node
-  linkType: hard
-
 "file-uri-to-path@npm:1.0.0":
   version: 1.0.0
   resolution: "file-uri-to-path@npm:1.0.0"
@@ -17682,6 +17685,7 @@ resolve@1.17.0:
     "@rollup/plugin-typescript": ^8.2.1
     "@theatre/core": "workspace:*"
     "@theatre/dataverse": "workspace:*"
+    "@theatre/dataverse-react": "workspace:*"
     "@types/fs-extra": ^9.0.11
     "@types/jest": ^26.0.23
     "@types/lodash": ^4.14.170
@@ -17720,7 +17724,6 @@ resolve@1.17.0:
     polished: ^4.1.3
     prop-types: ^15.7.2
     propose: ^0.0.5
-    queue-microtask: ^1.2.3
     react: ^17.0.2
     react-dom: ^17.0.2
     react-icons: ^4.2.0