Skip to content

Commit 1e2e7bc

Browse files
maiieulmaiieul
committed
chore(qwikuiprovider): remove + remove portal impl
1 parent 2168b55 commit 1e2e7bc

File tree

9 files changed

+94
-336
lines changed

9 files changed

+94
-336
lines changed

‎apps/website/src/routes/docs/headless/combobox/snippets/context-ids.tsx

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

‎apps/website/src/routes/docs/headless/combobox/snippets/qwik-ui-provider.tsx

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

‎apps/website/src/routes/layout.tsx

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import { Slot, component$, useStyles$ } from '@builder.io/qwik';
22
import { ContentMenu, useContent } from '@builder.io/qwik-city';
3-
import { QwikUIProvider } from '@qwik-ui/headless';
43
import { ComponentsStatusesMap, statusByComponent } from '~/_state/component-statuses';
54
import { KitName } from '~/_state/kit-name.type';
6-
import { useAppState } from '~/_state/use-app-state';
75
import Header from '~/components/header/header';
86
import docsStyles from './docs.css?inline';
97
import {
@@ -23,23 +21,20 @@ export default component$(() => {
2321
useStyles$(docsStyles);
2422

2523
const { menuItemsGroups } = useKitMenuItems();
26-
const rootStore = useAppState();
2724

2825
return (
2926
<>
3027
<Header showBottomBorder={true} showVersion={true} />
31-
<QwikUIProvider>
32-
<MDXProvider components={components}>
33-
<div class="setup-grid-areas lg:grid-cols-custom-lg 2xl:grid-cols-custom-2xl grid">
34-
<DocsNavigation linksGroups={menuItemsGroups} />
35-
<main class="docs [grid-area:main]">
36-
<Slot />
37-
</main>
38-
{/* future table of contents */}
39-
<div class="hidden [grid-area:toc]"></div>
40-
</div>
41-
</MDXProvider>
42-
</QwikUIProvider>
28+
<MDXProvider components={components}>
29+
<div class="setup-grid-areas lg:grid-cols-custom-lg 2xl:grid-cols-custom-2xl grid">
30+
<DocsNavigation linksGroups={menuItemsGroups} />
31+
<main class="docs [grid-area:main]">
32+
<Slot />
33+
</main>
34+
{/* future table of contents */}
35+
<div class="hidden [grid-area:toc]"></div>
36+
</div>
37+
</MDXProvider>
4338
<footer></footer>
4439
</>
4540
);

‎packages/kit-headless/src/components/combobox/combobox-portal.tsx

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

‎packages/kit-headless/src/components/combobox/combobox.spec.tsx

Lines changed: 84 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ import {
66
ComboboxLabel,
77
ComboboxListbox,
88
ComboboxOption,
9-
ComboboxPortal,
109
ComboboxTrigger,
1110
ResolvedOption,
1211
} from './index';
1312

14-
import { QwikUIProvider } from '../qwik-ui-provider';
1513
import './combobox-test.css';
1614
import createFakeFruitsList from './combobox.faketory';
1715

@@ -24,51 +22,47 @@ const StringCombobox = component$(({ defaultLabel, ...props }: StringCombobox) =
2422

2523
return (
2624
<>
27-
<QwikUIProvider>
28-
<Combobox
29-
options={fruits}
30-
defaultLabel={defaultLabel && defaultLabel}
31-
filter$={(value: string, options) =>
32-
options.filter(({ option }) => {
33-
return option.toLowerCase().includes(value.toLowerCase());
34-
})
35-
}
36-
{...props}
37-
>
38-
<ComboboxLabel>Fruits</ComboboxLabel>
39-
<ComboboxControl style={{ display: 'flex' }}>
40-
<ComboboxInput />
41-
<ComboboxTrigger data-testid="trigger">
42-
<svg
43-
xmlns="http://www.w3.org/2000/svg"
44-
viewBox="0 0 24 24"
45-
width="20px"
46-
style="stroke: black"
47-
stroke-width="2"
48-
stroke-linecap="round"
49-
stroke-linejoin="round"
50-
>
51-
<polyline points="6 9 12 15 18 9"></polyline>
52-
</svg>
53-
</ComboboxTrigger>
54-
</ComboboxControl>
55-
<ComboboxPortal>
56-
<ComboboxListbox
57-
style={{ width: 'fit-content' }}
58-
optionRenderer$={(resolved: ResolvedOption, index: number) => (
59-
<ComboboxOption
60-
key={resolved.key}
61-
class="group rounded-sm border-2 border-transparent px-2 hover:bg-[#496080] aria-selected:border-[#abbbce] aria-selected:bg-[#496080]"
62-
index={index}
63-
resolved={resolved}
64-
>
65-
{resolved.label}
66-
</ComboboxOption>
67-
)}
68-
/>
69-
</ComboboxPortal>
70-
</Combobox>
71-
</QwikUIProvider>
25+
<Combobox
26+
options={fruits}
27+
defaultLabel={defaultLabel && defaultLabel}
28+
filter$={(value: string, options) =>
29+
options.filter(({ option }) => {
30+
return option.toLowerCase().includes(value.toLowerCase());
31+
})
32+
}
33+
{...props}
34+
>
35+
<ComboboxLabel>Fruits</ComboboxLabel>
36+
<ComboboxControl style={{ display: 'flex' }}>
37+
<ComboboxInput />
38+
<ComboboxTrigger data-testid="trigger">
39+
<svg
40+
xmlns="http://www.w3.org/2000/svg"
41+
viewBox="0 0 24 24"
42+
width="20px"
43+
style="stroke: black"
44+
stroke-width="2"
45+
stroke-linecap="round"
46+
stroke-linejoin="round"
47+
>
48+
<polyline points="6 9 12 15 18 9"></polyline>
49+
</svg>
50+
</ComboboxTrigger>
51+
</ComboboxControl>
52+
<ComboboxListbox
53+
style={{ width: 'fit-content' }}
54+
optionRenderer$={(resolved: ResolvedOption, index: number) => (
55+
<ComboboxOption
56+
key={resolved.key}
57+
class="group rounded-sm border-2 border-transparent px-2 hover:bg-[#496080] aria-selected:border-[#abbbce] aria-selected:bg-[#496080]"
58+
index={index}
59+
resolved={resolved}
60+
>
61+
{resolved.label}
62+
</ComboboxOption>
63+
)}
64+
/>
65+
</Combobox>
7266
</>
7367
);
7468
});
@@ -394,53 +388,49 @@ const DisabledCombobox = component$(() => {
394388

395389
return (
396390
<>
397-
<QwikUIProvider>
398-
<Combobox
399-
options={objectExample}
400-
filter$={(value: string, options) =>
401-
options.filter(({ option }) => {
402-
return option.testLabel.toLowerCase().includes(value.toLowerCase());
403-
})
404-
}
405-
optionLabelKey="testLabel"
406-
optionValueKey="testValue"
407-
optionDisabledKey="disabled"
408-
>
409-
<ComboboxLabel>Fruits</ComboboxLabel>
410-
<ComboboxControl style={{ display: 'flex' }}>
411-
<ComboboxInput />
412-
<ComboboxTrigger data-testid="trigger">
413-
<svg
414-
xmlns="http://www.w3.org/2000/svg"
415-
viewBox="0 0 24 24"
416-
width="20px"
417-
style="stroke: black"
418-
stroke-width="2"
419-
stroke-linecap="round"
420-
stroke-linejoin="round"
421-
>
422-
<polyline points="6 9 12 15 18 9"></polyline>
423-
</svg>
424-
</ComboboxTrigger>
425-
</ComboboxControl>
426-
<ComboboxPortal>
427-
<ComboboxListbox
428-
style={{ width: 'fit-content' }}
429-
optionRenderer$={(resolved: ResolvedOption, index: number) => (
430-
<ComboboxOption
431-
key={resolved.key}
432-
class="group rounded-sm border-2 border-transparent px-2 hover:bg-[#496080] aria-selected:border-[#abbbce] aria-selected:bg-[#496080]"
433-
index={index}
434-
resolved={resolved}
435-
style={{ color: resolved.disabled ? 'gray' : undefined }}
436-
>
437-
{resolved.label}
438-
</ComboboxOption>
439-
)}
440-
/>
441-
</ComboboxPortal>
442-
</Combobox>
443-
</QwikUIProvider>
391+
<Combobox
392+
options={objectExample}
393+
filter$={(value: string, options) =>
394+
options.filter(({ option }) => {
395+
return option.testLabel.toLowerCase().includes(value.toLowerCase());
396+
})
397+
}
398+
optionLabelKey="testLabel"
399+
optionValueKey="testValue"
400+
optionDisabledKey="disabled"
401+
>
402+
<ComboboxLabel>Fruits</ComboboxLabel>
403+
<ComboboxControl style={{ display: 'flex' }}>
404+
<ComboboxInput />
405+
<ComboboxTrigger data-testid="trigger">
406+
<svg
407+
xmlns="http://www.w3.org/2000/svg"
408+
viewBox="0 0 24 24"
409+
width="20px"
410+
style="stroke: black"
411+
stroke-width="2"
412+
stroke-linecap="round"
413+
stroke-linejoin="round"
414+
>
415+
<polyline points="6 9 12 15 18 9"></polyline>
416+
</svg>
417+
</ComboboxTrigger>
418+
</ComboboxControl>
419+
<ComboboxListbox
420+
style={{ width: 'fit-content' }}
421+
optionRenderer$={(resolved: ResolvedOption, index: number) => (
422+
<ComboboxOption
423+
key={resolved.key}
424+
class="group rounded-sm border-2 border-transparent px-2 hover:bg-[#496080] aria-selected:border-[#abbbce] aria-selected:bg-[#496080]"
425+
index={index}
426+
resolved={resolved}
427+
style={{ color: resolved.disabled ? 'gray' : undefined }}
428+
>
429+
{resolved.label}
430+
</ComboboxOption>
431+
)}
432+
/>
433+
</Combobox>
444434
</>
445435
);
446436
});

‎packages/kit-headless/src/components/combobox/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ export * from './combobox-input';
77
export * from './combobox-trigger';
88
export * from './combobox-listbox';
99
export * from './combobox-option';
10-
export * from './combobox-portal';
1110
export * from './combobox-icon';
1211
export * from './combobox-popover';

‎packages/kit-headless/src/components/qwik-ui-provider/index.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)