Skip to content

Commit 07823ae

Browse files
Merge pull request #590 from maiieul/1.3.2-cleanup
1.3.2 cleanup
2 parents 87c0a05 + 67ecd14 commit 07823ae

File tree

187 files changed

+347
-4600
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+347
-4600
lines changed

CODING_STANDARDS.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ export type TooltipProps = {
5050
};
5151
```
5252

53-
Note: if you want to include the HTML attributes, you can use the `QwikIntrinsicElements` type from `@builder.io/qwik` package and extend it with the [intersection type](https://www.typescriptlang.org/docs/handbook/2/objects.html#intersection-types).
53+
Note: if you want to include the HTML attributes, you can use the `PropsOf` type.
5454

5555
Example:
5656

5757
```ts
58-
import { QwikIntrinsicElements } from '@builder.io/qwik';
58+
import { PropsOf } from '@builder.io/qwik';
5959

60-
export type TooltipProps = QwikIntrinsicElements['div'] & {
60+
export type TooltipProps = PropsOf<'div'> & {
6161
tip: string;
6262
type?: ColorTypes;
6363
position?: Positions;
@@ -107,7 +107,7 @@ return (
107107
## Example of headless button customization with Tailwind
108108

109109
```tsx
110-
import { component$, QwikIntrinsicElements, Slot } from '@builder.io/qwik';
110+
import { component$, Slot } from '@builder.io/qwik';
111111
import { Button as HeadlessButton, ButtonProps as ButtonHeadlessProps } from '@qwik-ui/headless';
112112

113113
type TailwindButtonProps = { size?: 'sm' | 'md', ... };
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
export enum ComponentStatus {
2-
Ready = 'Ready',
32
Beta = 'Beta',
43
Draft = 'Draft',
5-
Planned = 'Planned',
64
}

apps/website/src/_state/component-statuses.ts

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,47 +11,20 @@ export type ComponentKitsStatuses = {
1111

1212
export const statusByComponent: ComponentKitsStatuses = {
1313
fluffy: {
14-
Accordion: ComponentStatus.Planned,
15-
Alert: ComponentStatus.Planned,
16-
Badge: ComponentStatus.Planned,
17-
Breadcrumb: ComponentStatus.Planned,
14+
Badge: ComponentStatus.Beta,
1815
Button: ComponentStatus.Beta,
19-
'Button Group': ComponentStatus.Planned,
20-
Card: ComponentStatus.Planned,
21-
Carousel: ComponentStatus.Planned,
22-
Checkbox: ComponentStatus.Planned,
23-
Combobox: ComponentStatus.Planned,
24-
Drawer: ComponentStatus.Planned,
25-
Input: ComponentStatus.Planned,
26-
'Input Phone': ComponentStatus.Planned,
27-
'Navigation Bar': ComponentStatus.Planned,
28-
Modal: ComponentStatus.Planned,
2916
Pagination: ComponentStatus.Draft,
30-
Popover: ComponentStatus.Planned,
31-
Progress: ComponentStatus.Planned,
32-
Radio: ComponentStatus.Planned,
33-
Rating: ComponentStatus.Planned,
34-
Select: ComponentStatus.Planned,
35-
Slider: ComponentStatus.Planned,
36-
Spinner: ComponentStatus.Planned,
37-
Tabs: ComponentStatus.Planned,
38-
Toast: ComponentStatus.Planned,
39-
Toggle: ComponentStatus.Planned,
40-
Tooltip: ComponentStatus.Planned,
4117
},
4218
headless: {
4319
Accordion: ComponentStatus.Beta,
44-
Carousel: ComponentStatus.Planned,
4520
Collapsible: ComponentStatus.Draft,
4621
Combobox: ComponentStatus.Beta,
47-
Dialog: ComponentStatus.Planned,
4822
Modal: ComponentStatus.Beta,
4923
Pagination: ComponentStatus.Draft,
5024
Popover: ComponentStatus.Beta,
5125
Select: ComponentStatus.Draft,
5226
Separator: ComponentStatus.Beta,
5327
Tabs: ComponentStatus.Beta,
54-
Toggle: ComponentStatus.Planned,
5528
Tooltip: ComponentStatus.Draft,
5629
},
5730
};

apps/website/src/_state/status-tooltips.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

apps/website/src/components/anatomy-table/anatomy-table.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ export const AnatomyTable = component$(
2828
return (
2929
<tr key={propDescriptor.name}>
3030
<td class="align-center py-3 pl-2 pr-2 sm:pl-0 md:align-baseline">
31-
<code class="border-primary text-accent-foreground mr-6 rounded border border-b-2">
32-
{propDescriptor.name}
33-
</code>
31+
<div class="flex items-center gap-2">
32+
<code class="border-primary text-accent-foreground mr-6 rounded border border-b-2 px-2">
33+
{propDescriptor.name}
34+
</code>
35+
</div>
3436
</td>
3537
<td class="py-3 align-baseline">
3638
<div class="prose-docs-table">

apps/website/src/components/api-table/api-table.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ export const APITable = component$(({ propDescriptors }: APITableProps) => {
2626
{propDescriptors?.map((propDescriptor) => {
2727
return (
2828
<tr key={propDescriptor.name}>
29-
<td class="prose prose-sm py-3 pl-4 sm:pl-0 ">
30-
<code class="border-primary mr-6 rounded-md border border-b-[2px]">
31-
{propDescriptor.name}
32-
</code>
29+
<td class="py-3 pl-4 sm:pl-0">
30+
<div class="flex items-center gap-2">
31+
<code class="border-primary mr-6 rounded-md border border-b-[2px] px-2">
32+
{propDescriptor.name}
33+
</code>
34+
</div>
3335
</td>
3436
<td class="py-3">
3537
<div class="flex items-center gap-2">

apps/website/src/components/code-copy/code-copy.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { cn } from '@qwik-ui/utils';
2-
import { PropsOf, QwikIntrinsicElements, component$, useSignal } from '@builder.io/qwik';
2+
import { PropsOf, component$, useSignal } from '@builder.io/qwik';
33
import { Button } from '@qwik-ui/fluffy';
44
import copy from 'clipboard-copy';
55

@@ -32,7 +32,7 @@ export const CodeCopy = component$(({ code = '', class: outsideClass, ...props }
3232
);
3333
});
3434

35-
export function CopyIcon(props: QwikIntrinsicElements['svg'], key: string) {
35+
export function CopyIcon(props: PropsOf<'svg'>, key: string) {
3636
return (
3737
<svg
3838
xmlns="http://www.w3.org/2000/svg"
@@ -54,7 +54,7 @@ export function CopyIcon(props: QwikIntrinsicElements['svg'], key: string) {
5454
);
5555
}
5656

57-
export function ClipboardCheck(props: QwikIntrinsicElements['svg'], key: string) {
57+
export function ClipboardCheck(props: PropsOf<'svg'>, key: string) {
5858
return (
5959
<svg
6060
xmlns="http://www.w3.org/2000/svg"

apps/website/src/components/code-example/code-example-container.tsx

Lines changed: 0 additions & 12 deletions
This file was deleted.

apps/website/src/components/code-example/code-example.tsx

Lines changed: 0 additions & 17 deletions
This file was deleted.

apps/website/src/components/code-snippet/code-snippet.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { QwikIntrinsicElements, component$, useSignal, useTask$ } from '@builder.io/qwik';
1+
import { PropsOf, component$, useSignal, useTask$ } from '@builder.io/qwik';
22
import { useLocation } from '@builder.io/qwik-city';
33
import { isDev } from '@builder.io/qwik/build';
44
import { Highlight } from '../highlight/highlight';
@@ -14,7 +14,7 @@ const codeSnippets: any = import.meta.glob('/src/routes/docs/**/**/snippets/*',
1414
eager: isDev ? false : true,
1515
});
1616

17-
type CodeSnippetProps = QwikIntrinsicElements['div'] & {
17+
type CodeSnippetProps = PropsOf<'div'> & {
1818
name: string;
1919
};
2020

0 commit comments

Comments
 (0)