Add touch support to useDrag - wip

package.json

@@ -1,7 +1,7 @@
 {
   "name": "theatre-monorepo",
   "license": "Apache-2.0",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "workspaces": [
     "packages/*",
     "examples/*",

packages/browser-bundles/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theatre/browser-bundles",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "license": "SEE LICENSE IN LICENSE",
   "author": {
     "name": "Aria Minaei",

packages/dataverse/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theatre/dataverse",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "license": "Apache-2.0",
   "author": {
     "name": "Aria Minaei",

packages/r3f/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theatre/r3f",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "license": "Apache-2.0",
   "authors": [
     {

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theatre/react",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "license": "Apache-2.0",
   "author": {
     "name": "Aria Minaei",

packages/theatric/package.json

@@ -1,6 +1,6 @@
 {
   "name": "theatric",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "license": "Apache-2.0",
   "author": {
     "name": "Andrew Prifer",

theatre/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theatre/core",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "license": "Apache-2.0",
   "description": "Motion design editor for the web",
   "repository": {

theatre/core/src/sequences/Sequence.ts

@@ -44,6 +44,9 @@ const possibleDirections = [
 ]
 
 export default class Sequence implements PointerToPrismProvider {
+  get type(): 'Theatre_Sequence' {
+    return 'Theatre_Sequence'
+  }
   public readonly address: SequenceAddress
   publicApi: TheatreSequence
 
@@ -98,6 +101,7 @@ export default class Sequence implements PointerToPrismProvider {
         length: val(this.pointer.length),
         playing: val(this.pointer.playing),
         position: val(this.pointer.position),
+        subUnitsPerUnit: val(this.pointer.subUnitsPerUnit),
       })) as $IntentionalAny as Prism<V>
     }
     if (path.length > 1) {
@@ -106,6 +110,8 @@ export default class Sequence implements PointerToPrismProvider {
     const [prop] = path
     if (prop === 'length') {
       return this._lengthD as $IntentionalAny as Prism<V>
+    } else if (prop === 'subUnitsPerUnit') {
+      return this._subUnitsPerUnitD as $IntentionalAny as Prism<V>
     } else if (prop === 'position') {
       return this._positionD as $IntentionalAny as Prism<V>
     } else if (prop === 'playing') {

theatre/core/src/sequences/TheatreSequence.ts

@@ -132,6 +132,7 @@ export interface ISequence {
     playing: boolean
     length: number
     position: number
+    subUnitsPerUnit: number
   }>
 
   /**

theatre/core/src/sheets/TheatreSheet.ts

@@ -102,6 +102,10 @@ export interface ISheet {
     },
   ): ISheetObject<Props>
 
+  __experimental_getExistingObject<Props extends UnknownShorthandCompoundProps>(
+    key: string,
+  ): ISheetObject<Props> | undefined
+
   /**
    * Detaches a previously created child object from the sheet.
    *
@@ -204,6 +208,20 @@ export default class TheatreSheet implements ISheet {
     }
   }
 
+  __experimental_getExistingObject<Props extends UnknownShorthandCompoundProps>(
+    key: string,
+  ): ISheetObject<Props> | undefined {
+    const internal = privateAPI(this)
+    const sanitizedPath = validateAndSanitiseSlashedPathOrThrow(
+      key,
+      `sheet.object`,
+    )
+
+    const existingObject = internal.getObject(sanitizedPath as ObjectAddressKey)
+
+    return existingObject?.publicApi as $IntentionalAny
+  }
+
   get sequence(): TheatreSequence {
     return privateAPI(this).getSequence().publicApi
   }

theatre/package.json

@@ -1,7 +1,7 @@
 {
   "name": "theatre",
   "private": true,
-  "version": "0.7.0",
+  "version": "0.7.1",
   "workspaces": [
     "./shared",
     "./core",

theatre/shared/src/instanceTypes.ts

@@ -5,6 +5,7 @@ import type SheetObjectTemplate from '@theatre/core/sheetObjects/SheetObjectTemp
 import type Sheet from '@theatre/core/sheets/Sheet'
 import type SheetTemplate from '@theatre/core/sheets/SheetTemplate'
 import type {$IntentionalAny} from './utils/types'
+import type Sequence from '@theatre/core/sequences/Sequence'
 
 /**
  * Since \@theatre/core and \@theatre/studio are separate bundles,
@@ -22,6 +23,8 @@ export const isSheetTemplate = typeAsserter<SheetTemplate>(
 
 export const isSheetObject = typeAsserter<SheetObject>('Theatre_SheetObject')
 
+export const isSequence = typeAsserter<Sequence>('Theatre_Sequence')
+
 export const isSheetObjectTemplate = typeAsserter<SheetObjectTemplate>(
   'Theatre_SheetObjectTemplate',
 )

theatre/studio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theatre/studio",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "license": "AGPL-3.0-only",
   "description": "Motion design editor for the web",
   "repository": {

theatre/studio/src/StudioStore/createTransactionPrivateApi.ts

@@ -1,7 +1,8 @@
 import type {Pointer} from '@theatre/dataverse'
-import {isSheetObject} from '@theatre/shared/instanceTypes'
+import {isSequence, isSheetObject} from '@theatre/shared/instanceTypes'
 import type {$FixMe, $IntentionalAny} from '@theatre/shared/utils/types'
 import get from 'lodash-es/get'
+import isInteger from 'lodash-es/isInteger'
 import type {ITransactionPrivateApi} from './StudioStore'
 import forEachPropDeep from '@theatre/shared/utils/forEachDeep'
 import getDeep from '@theatre/shared/utils/getDeep'
@@ -186,9 +187,36 @@ export default function createTransactionPrivateApi(
         } else {
           setStaticOrKeyframeProp(_value, propConfig, path)
         }
+      } else if (isSequence(root)) {
+        const [prop] = path
+        if (prop === 'subUnitsPerUnit') {
+          if (typeof _value !== 'number' || !isInteger(_value) || _value < 1) {
+            throw new Error(
+              `Value ${_value} is not an integer, which is required for setting sequence prop ${prop}`,
+            )
+          }
+          stateEditors.coreByProject.historic.sheetsById.sequence.setSubUnitsPerUnit(
+            {
+              ...root.address,
+              subUnitsPerUnit: _value,
+            },
+          )
+        } else if (prop === 'length') {
+          if (typeof _value !== 'number' || _value <= 0.001) {
+            throw new Error(
+              `Value ${_value} is not a positive number, which is required for setting sequence prop ${prop}`,
+            )
+          }
+          stateEditors.coreByProject.historic.sheetsById.sequence.setLength({
+            ...root.address,
+            length: _value,
+          })
+        } else {
+          throw new Error(`Setting sequence prop ${prop} is not supported`)
+        }
       } else {
         throw new Error(
-          'Only setting props of SheetObject-s is supported in a transaction so far',
+          'Only setting props of SheetObject-s and sequences is supported in a transaction so far',
         )
       }
     },

theatre/studio/src/store/stateEditors.ts

@@ -671,6 +671,12 @@ namespace stateEditors {
             )
           }
 
+          export function setSubUnitsPerUnit(
+            p: WithoutSheetInstance<SheetAddress> & {subUnitsPerUnit: number},
+          ) {
+            _ensure(p).subUnitsPerUnit = clamp(p.subUnitsPerUnit, 1, 2 ** 12)
+          }
+
           function _ensureTracksOfObject(
             p: WithoutSheetInstance<SheetObjectAddress>,
           ) {