Skip to content

Commit

Permalink
Merge branch 'main' into renovate/react-three-fiber-8.x
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuaellis authored Mar 17, 2023
2 parents 27cc6fd + 32c4b34 commit 1280019
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 13 deletions.
4 changes: 2 additions & 2 deletions docs/app/components/HomeBlocks/HomeBlockMore.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ const dataFixtures = [
</div><div data-line="23" class="highlight-line" data-highlighted="false"><span class="token plain-text"> </span><span class="token tag"><span class="token tag"><span class="token punctuation">&lt;/</span><span class="token class-name">Dialog.Root</span></span><span class="token punctuation">&gt;</span></span>
</div><div data-line="24" class="highlight-line" data-highlighted="false"> <span class="token punctuation">)</span>
</div><div data-line="25" class="highlight-line" data-highlighted="false"><span class="token punctuation">}</span>
</div></code>`,
`<code class="language-jsx" lines="7"><div data-line="1" class="highlight-line" data-highlighted="false"><span class="token keyword module">import</span> <span class="token imports"><span class="token operator">*</span> <span class="token keyword module">as</span> <span class="token maybe-class-name">Dialog</span></span> <span class="token keyword module">from</span> <span class="token string">'@radix-ui/react-dialog'</span>
</div>`,
`<div data-line="1" class="highlight-line" data-highlighted="false"><span class="token keyword module">import</span> <span class="token imports"><span class="token operator">*</span> <span class="token keyword module">as</span> <span class="token maybe-class-name">Dialog</span></span> <span class="token keyword module">from</span> <span class="token string">'@radix-ui/react-dialog'</span>
</div><div data-line="2" class="highlight-line" data-highlighted="false"><span class="token keyword module">import</span> <span class="token imports"><span class="token punctuation">{</span> styled <span class="token punctuation">}</span></span> <span class="token keyword module">from</span> <span class="token string">'@stitches/react'</span>
</div><div data-line="3" class="highlight-line" data-highlighted="false"><span class="token keyword module">import</span> <span class="token imports"><span class="token punctuation">{</span> animated<span class="token punctuation">,</span> useSpring <span class="token punctuation">}</span></span> <span class="token keyword module">from</span> <span class="token string">'@react-spring/web'</span>
</div><div data-line="4" class="highlight-line" data-highlighted="false">
Expand Down
8 changes: 8 additions & 0 deletions docs/app/data/fixtures.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,14 @@ export const USE_SCROLL_CONFIG_DATA: CellData[][] = [
),
]

export const USE_RESIZE_CONFIG_DATA: CellData[][] = [
['container', 'React.MutableRefObject<HTMLElement | null | undefined>', null],
...DEFAULT_CONFIG_DATA.filter(
row =>
row[0] !== 'from' && typeof row[0] === 'object' && row[0]?.label !== 'to'
),
]

export const USESPRINGVALUE_CONFIG_DATA: CellData[][] = [
[
{
Expand Down
4 changes: 2 additions & 2 deletions docs/app/routes/docs/utilities/use-resize.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ function MyComponent() {
## Reference

import { TablesConfiguration } from '~/components/Tables/TablesConfig'
import { USE_SCROLL_CONFIG_DATA } from '~/data/fixtures'
import { USE_RESIZE_CONFIG_DATA } from '~/data/fixtures'

<TablesConfiguration data={USE_SCROLL_CONFIG_DATA} />
<TablesConfiguration data={USE_RESIZE_CONFIG_DATA} />

## Typescript

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/hooks/useResize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { SpringProps, SpringValues } from '../types'
import { useSpring } from './useSpring'

export interface UseResizeOptions extends Omit<SpringProps, 'to' | 'from'> {
container?: MutableRefObject<HTMLElement>
container?: MutableRefObject<HTMLElement | null | undefined>
}

/**
Expand Down
14 changes: 6 additions & 8 deletions turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@
"$schema": "https://turborepo.org/schema.json",
"pipeline": {
"build": {
"outputs": ["dist/**"],
"outputs": ["dist/**", "public/build/**", "api/**"],
"dependsOn": ["^build"]
},
"test": {
"outputs": ["coverage/**"],
"dependsOn": []
},
"lint": {
"outputs": []
"test:unit": {
"inputs": ["packages/**/src/**", "targets/**/src/**"]
},
"dev": {
"cache": false
"dependsOn": ["^build"],
"cache": false,
"persistent": true
},
"clean": {
"cache": false
Expand Down

0 comments on commit 1280019

Please sign in to comment.