Skip to content

Commit 3d64155

Browse files
Merge pull request #312 from softnetics/supakorn/fix/components
feat: remove redundant `TanstackTableFrame`, and deprecated component.
2 parents beb2746 + 4eead5b commit 3d64155

4 files changed

Lines changed: 59 additions & 12 deletions

File tree

.changeset/slow-kings-fix.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@example/ui-playground": patch
3+
"@genseki/ui": patch
4+
"@genseki/react": patch
5+
---
6+
7+
feat: remove redundant `TanstackTableFrame`, and deprecated component.

examples/ui-playground/src/app/playground/shadcn/table/page.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
PaginationPrevious,
2121
TanstackTable,
2222
TanstackTableContainer,
23-
TanstackTableFrame,
2423
} from '@genseki/ui'
2524

2625
interface User {
@@ -493,10 +492,9 @@ function BasicStickyColumnTable() {
493492
const lastPage = pageIndex === Math.ceil(users.length / pageSize) - 1
494493

495494
return (
496-
<TanstackTableFrame>
497-
<TanstackTableContainer variant="naked">
498-
<TanstackTable table={table} />
499-
</TanstackTableContainer>
495+
<TanstackTableContainer>
496+
<TanstackTable table={table} />
497+
500498
<PaginationBarContainer>
501499
<Pagination>
502500
<PaginationContent>
@@ -522,7 +520,7 @@ function BasicStickyColumnTable() {
522520
</PageSizeSelect>
523521
</div>
524522
</PaginationBarContainer>
525-
</TanstackTableFrame>
523+
</TanstackTableContainer>
526524
)
527525
}
528526

legacies/react/src/react/components/primitives/menu.tsx

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,28 @@ import {
3636
import { PopoverContent } from './popover'
3737
import { composeTailwindRenderProps } from './primitive'
3838

39+
/**
40+
* @deprecated Switch to `DropdownMenu`
41+
*/
3942
interface MenuContextProps {
4043
respectScreen: boolean
4144
}
4245

46+
/**
47+
* @deprecated Switch to `DropdownMenu`
48+
*/
4349
const MenuContext = createContext<MenuContextProps>({ respectScreen: true })
4450

51+
/**
52+
* @deprecated Switch to `DropdownMenu`
53+
*/
4554
interface MenuProps extends MenuTriggerPrimitiveProps {
4655
respectScreen?: boolean
4756
}
4857

58+
/**
59+
* @deprecated Switch to `DropdownMenu`
60+
*/
4961
const Menu = ({ respectScreen = true, ...props }: MenuProps) => {
5062
return (
5163
<MenuContext value={{ respectScreen }}>
@@ -54,16 +66,25 @@ const Menu = ({ respectScreen = true, ...props }: MenuProps) => {
5466
)
5567
}
5668

69+
/**
70+
* @deprecated Switch to `DropdownMenu`
71+
*/
5772
const MenuSubMenu = ({ delay = 0, ...props }) => (
5873
<SubmenuTriggerPrimitive {...props} delay={delay}>
5974
{props.children}
6075
</SubmenuTriggerPrimitive>
6176
)
6277

78+
/**
79+
* @deprecated Switch to `DropdownMenu`
80+
*/
6381
interface MenuTriggerProps extends ButtonProps {
6482
className?: string
6583
}
6684

85+
/**
86+
* @deprecated Switch to `DropdownMenu`
87+
*/
6788
const MenuTrigger = React.forwardRef<HTMLButtonElement, MenuTriggerProps>(
6889
({ className, ...props }, ref) => (
6990
<Button
@@ -80,6 +101,9 @@ const MenuTrigger = React.forwardRef<HTMLButtonElement, MenuTriggerProps>(
80101
)
81102
)
82103

104+
/**
105+
* @deprecated Switch to `DropdownMenu`
106+
*/
83107
interface MenuContentProps<T>
84108
extends Pick<
85109
PopoverProps,
@@ -99,6 +123,9 @@ interface MenuContentProps<T>
99123
respectScreen?: boolean
100124
}
101125

126+
/**
127+
* @deprecated Switch to `DropdownMenu`
128+
*/
102129
const MenuContent = <T extends object>({
103130
className,
104131
showArrow = false,
@@ -137,10 +164,16 @@ const MenuContent = <T extends object>({
137164
)
138165
}
139166

167+
/**
168+
* @deprecated Switch to `DropdownMenu`
169+
*/
140170
interface MenuItemProps extends MenuItemPrimitiveProps, VariantProps<typeof dropdownItemStyles> {
141171
isDanger?: boolean
142172
}
143173

174+
/**
175+
* @deprecated Switch to `DropdownMenu`
176+
*/
144177
const MenuItem = ({ className, isDanger = false, children, ...props }: MenuItemProps) => {
145178
const textValue = props.textValue || (typeof children === 'string' ? children : undefined)
146179
return (
@@ -190,10 +223,16 @@ const MenuItem = ({ className, isDanger = false, children, ...props }: MenuItemP
190223
)
191224
}
192225

226+
/**
227+
* @deprecated Switch to `DropdownMenu`
228+
*/
193229
export interface MenuHeaderProps extends React.ComponentProps<typeof Header> {
194230
separator?: boolean
195231
}
196232

233+
/**
234+
* @deprecated Switch to `DropdownMenu`
235+
*/
197236
const MenuHeader = ({ className, separator = false, ...props }: MenuHeaderProps) => (
198237
<Header
199238
className={twMerge(
@@ -205,13 +244,22 @@ const MenuHeader = ({ className, separator = false, ...props }: MenuHeaderProps)
205244
/>
206245
)
207246

247+
/**
248+
* @deprecated Switch to `DropdownMenu`
249+
*/
208250
const { section, header } = dropdownSectionStyles()
209251

252+
/**
253+
* @deprecated Switch to `DropdownMenu`
254+
*/
210255
interface MenuSectionProps<T> extends MenuSectionPrimitiveProps<T> {
211256
ref?: React.Ref<HTMLElement>
212257
title?: string
213258
}
214259

260+
/**
261+
* @deprecated Switch to `DropdownMenu`
262+
*/
215263
// TODO: /** @ts-expect-error The legacy ref here is bastards */
216264
const MenuSection = <T extends object>({ className, ref, ...props }: MenuSectionProps<T>) => {
217265
return (

packages/ui/src/components/primitives/tanstack-table.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -265,12 +265,6 @@ export const TableEmpty = (props: {
265265
)
266266
}
267267

268-
export function TanstackTableFrame({ className, ...props }: React.ComponentPropsWithRef<'div'>) {
269-
return (
270-
<div className={cn('overflow-auto border rounded-sm border-border', className)} {...props} />
271-
)
272-
}
273-
274268
declare module '@tanstack/react-table' {
275269
interface ColumnMeta<TData extends RowData, TValue> {
276270
tdClassName?: string

0 commit comments

Comments
 (0)