diff --git a/labs/folk-graph.ts b/labs/folk-graph.ts index 88e3653..a9329ed 100644 --- a/labs/folk-graph.ts +++ b/labs/folk-graph.ts @@ -1,9 +1,9 @@ -import { FolkBaseSet } from './folk-base-set.ts'; +import { AnimationFrameController, AnimationFrameControllerHost, TransformIntegrator } from '@lib'; import { PropertyValues } from '@lit/reactive-element'; import { Layout } from 'webcola'; -import { FolkShape } from './folk-shape.ts'; -import { AnimationFrameController, AnimationFrameControllerHost, TransformIntegrator } from '@lib'; import { FolkBaseConnection } from './folk-base-connection'; +import { FolkBaseSet } from './folk-base-set.ts'; +import { FolkShape } from './folk-shape.ts'; export class FolkGraph extends FolkBaseSet implements AnimationFrameControllerHost { static override tagName = 'folk-graph'; @@ -71,7 +71,7 @@ export class FolkGraph extends FolkBaseSet implements AnimationFrameControllerHo console.log(colaNodes, colaLinks); - this.graphSim.nodes(colaNodes).links(colaLinks).linkDistance(150).avoidOverlaps(true).handleDisconnected(true); + this.graphSim.nodes(colaNodes).links(colaLinks).linkDistance(250).avoidOverlaps(true).handleDisconnected(true); } private createNodes() { diff --git a/labs/folk-shape.ts b/labs/folk-shape.ts index 1552223..40e6e75 100644 --- a/labs/folk-shape.ts +++ b/labs/folk-shape.ts @@ -1,5 +1,6 @@ import { getResizeCursorUrl, getRotateCursorUrl } from '@labs/utils/cursors'; -import { DOMRectTransform, DOMRectTransformReadonly, Point, ResizeObserverManager, TransformEvent, Vector } from '@lib'; +import { DOMRectTransform, DOMRectTransformReadonly, Point, TransformEvent, Vector } from '@lib'; +import { ResizeObserverManager } from '@lib/resize-observer'; import { css, html } from '@lib/tags'; const resizeObserver = new ResizeObserverManager(); diff --git a/lib/folk-observer.ts b/lib/folk-observer.ts index 5d2ce03..a89f0e7 100644 --- a/lib/folk-observer.ts +++ b/lib/folk-observer.ts @@ -121,7 +121,7 @@ class IframeObserver { callback({ target: this.#iframe, contentRect, - }) + }), ); } @@ -165,7 +165,7 @@ export class FolkObserver { observe( target: Element, callback: ClientRectObserverEntryCallback, - { iframeSelector }: FolkObserverOptions = {} + { iframeSelector }: FolkObserverOptions = {}, ): void { if (target instanceof HTMLIFrameElement && iframeSelector) { let iframeObserver = this.#iframeMap.get(target); @@ -202,7 +202,7 @@ export class FolkObserver { unobserve( target: Element, callback: ClientRectObserverEntryCallback, - { iframeSelector }: FolkObserverOptions = {} + { iframeSelector }: FolkObserverOptions = {}, ): void { if (target instanceof HTMLIFrameElement && iframeSelector) { let iframeObserver = this.#iframeMap.get(target); diff --git a/lib/index.ts b/lib/index.ts index 2c45ab1..bd1f9c7 100644 --- a/lib/index.ts +++ b/lib/index.ts @@ -1,6 +1,7 @@ -// Animation and timing -export * from './animation-frame-controller'; -export * from './rAF'; +// Observers (move these to the top since they're dependencies) +export * from './client-rect-observer'; +export * from './folk-observer'; +export * from './resize-observer'; // Core utilities and types export * from './Matrix'; @@ -12,10 +13,9 @@ export * from '../labs/utils/cursors'; export * from './DOMRectTransform'; export * from './TransformEvent'; -// Observers -export * from './client-rect-observer'; -export * from './folk-observer'; -export * from './resize-observer'; +// Animation and timing +export * from './animation-frame-controller'; +export * from './rAF'; // Integration and effects export * from './collision'; diff --git a/website/canvas/physics.html b/website/canvas/physics.html index 2f4453d..1bd5029 100644 --- a/website/canvas/physics.html +++ b/website/canvas/physics.html @@ -1,4 +1,4 @@ - + @@ -37,13 +37,13 @@ - +