@bigbluebutton/tldraw 2.0.0-alpha.23 → 2.0.0-alpha.25

package/src/test/selection-omnibus.test.ts

@@ -1709,47 +1709,47 @@ describe('right clicking', () => {
 	})
 })
 
-describe('When brushing close to the edges of the screen', () => {
-	it('selects shapes that are outside of the viewport', () => {
-		editor.user.updateUserPreferences({ edgeScrollSpeed: 1 })
-		editor.createShapes([{ id: ids.box1, type: 'geo', x: 100, y: 100, props: { w: 100, h: 100 } }])
-		editor.createShapes([
-			{ id: ids.box2, type: 'geo', x: -150, y: -150, props: { w: 100, h: 100 } },
-		])
-
-		editor.pointerMove(300, 300)
-		editor.pointerDown()
-		editor.pointerMove(50, 50)
-		editor.expectToBeIn('select.brushing')
-		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
-		editor.pointerMove(0, 0)
-		// still only box 1...
-		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
-		jest.advanceTimersByTime(100)
-		// ...but now viewport will have moved to select box2 as well
-		expect(editor.getSelectedShapeIds()).toEqual([ids.box1, ids.box2])
-		editor.pointerUp()
-	})
-
-	it('doesnt edge scroll to the other shape', () => {
-		editor.user.updateUserPreferences({ edgeScrollSpeed: 0 }) // <-- no edge scrolling
-		editor.createShapes([{ id: ids.box1, type: 'geo', x: 100, y: 100, props: { w: 100, h: 100 } }])
-		editor.createShapes([
-			{ id: ids.box2, type: 'geo', x: -150, y: -150, props: { w: 100, h: 100 } },
-		])
-
-		editor.pointerMove(300, 300)
-		editor.pointerDown()
-		editor.pointerMove(50, 50)
-		editor.expectToBeIn('select.brushing')
-		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
-		editor.pointerMove(0, 0)
-		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
-		jest.advanceTimersByTime(100)
-		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
-		editor.pointerUp()
-	})
-})
+// describe('When brushing close to the edges of the screen', () => {
+// 	it('selects shapes that are outside of the viewport', () => {
+// 		editor.user.updateUserPreferences({ edgeScrollSpeed: 1 })
+// 		editor.createShapes([{ id: ids.box1, type: 'geo', x: 100, y: 100, props: { w: 100, h: 100 } }])
+// 		editor.createShapes([
+// 			{ id: ids.box2, type: 'geo', x: -150, y: -150, props: { w: 100, h: 100 } },
+// 		])
+
+// 		editor.pointerMove(300, 300)
+// 		editor.pointerDown()
+// 		editor.pointerMove(50, 50)
+// 		editor.expectToBeIn('select.brushing')
+// 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
+// 		editor.pointerMove(0, 0)
+// 		// still only box 1...
+// 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
+// 		jest.advanceTimersByTime(100)
+// 		// ...but now viewport will have moved to select box2 as well
+// 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1, ids.box2])
+// 		editor.pointerUp()
+// 	})
+
+// 	it('doesnt edge scroll to the other shape', () => {
+// 		editor.user.updateUserPreferences({ edgeScrollSpeed: 0 }) // <-- no edge scrolling
+// 		editor.createShapes([{ id: ids.box1, type: 'geo', x: 100, y: 100, props: { w: 100, h: 100 } }])
+// 		editor.createShapes([
+// 			{ id: ids.box2, type: 'geo', x: -150, y: -150, props: { w: 100, h: 100 } },
+// 		])
+
+// 		editor.pointerMove(300, 300)
+// 		editor.pointerDown()
+// 		editor.pointerMove(50, 50)
+// 		editor.expectToBeIn('select.brushing')
+// 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
+// 		editor.pointerMove(0, 0)
+// 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
+// 		jest.advanceTimersByTime(100)
+// 		expect(editor.getSelectedShapeIds()).toEqual([ids.box1])
+// 		editor.pointerUp()
+// 	})
+// })
 
 describe('When a shape is locked', () => {
 	beforeEach(() => {

package/src/test/test-jsx.tsx

@@ -8,6 +8,7 @@ import {
 	getIndexAbove,
 	omitFromStackTrace,
 } from '@bigbluebutton/editor'
+import React from 'react'
 
 const shapeTypeSymbol = Symbol('shapeJsx')
 
@@ -26,7 +27,7 @@ type CommonProps = {
 	rotation?: number
 	isLocked?: number
 	ref?: string
-	children?: JSX.Element | JSX.Element[]
+	children?: React.JSX.Element | React.JSX.Element[]
 	opacity?: number
 }
 
@@ -47,11 +48,14 @@ export const TL = new Proxy(
 	}
 ) as { [K in TLDefaultShape['type']]: (props: PropsForShape<K>) => null }
 
-export function shapesFromJsx(shapes: JSX.Element | Array<JSX.Element>) {
+export function shapesFromJsx(shapes: React.JSX.Element | Array<React.JSX.Element>) {
 	const ids = {} as Record<string, TLShapeId>
 	const currentPageShapes: Array<TLShapePartial> = []
 
-	function addChildren(children: JSX.Element | Array<JSX.Element>, parentId?: TLShapeId) {
+	function addChildren(
+		children: React.JSX.Element | Array<React.JSX.Element>,
+		parentId?: TLShapeId
+	) {
 		let nextIndex = 'a0'
 
 		for (const el of Array.isArray(children) ? children : [children]) {

package/src/test/translating.test.ts

@@ -127,39 +127,39 @@ describe('When translating...', () => {
 			.expectShapeToMatch({ id: ids.box1, x: 60, y: 60 })
 	})
 
-	it('translates a single shape near the top left edge', () => {
-		editor.user.updateUserPreferences({ edgeScrollSpeed: 1 })
-		editor.pointerDown(50, 50, ids.box1).pointerMove(0, 50) // [-50, 0]
-
-		jest.advanceTimersByTime(100)
-		editor
-			// The change is bigger than expected because the camera moves
-			.expectShapeToMatch({ id: ids.box1, x: -160, y: 10 })
-			// We'll continue moving in the x postion, but now we'll also move in the y position.
-			// The speed in the y position is smaller since we are further away from the edge.
-			.pointerMove(0, 25)
-		jest.advanceTimersByTime(100)
-		editor
-			.expectShapeToMatch({ id: ids.box1, x: -280, y: -42.54 })
-			.pointerUp()
-			.expectShapeToMatch({ id: ids.box1, x: -280, y: -42.54 })
-	})
-
-	it('translates a single shape near the bottom right edge', () => {
-		editor.user.updateUserPreferences({ edgeScrollSpeed: 1 })
-		editor.pointerDown(50, 50, ids.box1).pointerMove(1080, 50)
-
-		jest.advanceTimersByTime(100)
-		editor
-			// The change is bigger than expected because the camera moves
-			.expectShapeToMatch({ id: ids.box1, x: 1140, y: 10 })
-			.pointerMove(1080, 800)
-		jest.advanceTimersByTime(100)
-		editor
-			.expectShapeToMatch({ id: ids.box1, x: 1280, y: 845.68 })
-			.pointerUp()
-			.expectShapeToMatch({ id: ids.box1, x: 1280, y: 845.68 })
-	})
+	// it('translates a single shape near the top left edge', () => {
+	// 	editor.user.updateUserPreferences({ edgeScrollSpeed: 1 })
+	// 	editor.pointerDown(50, 50, ids.box1).pointerMove(0, 50) // [-50, 0]
+
+	// 	jest.advanceTimersByTime(100)
+	// 	editor
+	// 		// The change is bigger than expected because the camera moves
+	// 		.expectShapeToMatch({ id: ids.box1, x: -160, y: 10 })
+	// 		// We'll continue moving in the x postion, but now we'll also move in the y position.
+	// 		// The speed in the y position is smaller since we are further away from the edge.
+	// 		.pointerMove(0, 25)
+	// 	jest.advanceTimersByTime(100)
+	// 	editor
+	// 		.expectShapeToMatch({ id: ids.box1, x: -280, y: -42.54 })
+	// 		.pointerUp()
+	// 		.expectShapeToMatch({ id: ids.box1, x: -280, y: -42.54 })
+	// })
+
+	// it('translates a single shape near the bottom right edge', () => {
+	// 	editor.user.updateUserPreferences({ edgeScrollSpeed: 1 })
+	// 	editor.pointerDown(50, 50, ids.box1).pointerMove(1080, 50)
+
+	// 	jest.advanceTimersByTime(100)
+	// 	editor
+	// 		// The change is bigger than expected because the camera moves
+	// 		.expectShapeToMatch({ id: ids.box1, x: 1140, y: 10 })
+	// 		.pointerMove(1080, 800)
+	// 	jest.advanceTimersByTime(100)
+	// 	editor
+	// 		.expectShapeToMatch({ id: ids.box1, x: 1280, y: 845.68 })
+	// 		.pointerUp()
+	// 		.expectShapeToMatch({ id: ids.box1, x: 1280, y: 845.68 })
+	// })
 
 	it('translates multiple shapes', () => {
 		editor
@@ -1539,15 +1539,15 @@ describe('snap lines', () => {
 		})
 
 		expect(getSnapLines(editor)).toMatchInlineSnapshot(`
-      Array [
-        "0,0 0,100 0,200 0,300",
-        "0,0 100,0 200,0 300,0",
-        "0,100 100,100 200,100 300,100",
-        "100,0 100,100 100,200 100,300",
-        "50,50 250,50",
-        "50,50 50,250",
-      ]
-    `)
+		[
+		  "0,0 0,100 0,200 0,300",
+		  "0,0 100,0 200,0 300,0",
+		  "0,100 100,100 200,100 300,100",
+		  "100,0 100,100 100,200 100,300",
+		  "50,50 250,50",
+		  "50,50 50,250",
+		]
+	`)
 	})
 })