@ark-ui/solid 3.0.0-4 → 3.0.0-6

package/dist/source/components/pagination/use-pagination.js

@@ -1,11 +1,18 @@
 import * as pagination from '@zag-js/pagination';
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const usePagination = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({ id: createUniqueId(), dir: locale().dir, getRootNode: environment().getRootNode }, props);
-    const [state, send] = useMachine(pagination.machine(context), { context });
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
+        dir: locale().dir,
+        getRootNode: environment().getRootNode,
+        page: props.defaultPage,
+        ...props,
+    }));
+    const [state, send] = useMachine(pagination.machine(context()), { context });
     return createMemo(() => pagination.connect(state, send, normalizeProps));
 };

package/dist/source/components/pin-input/pin-input-root.jsx

@@ -7,6 +7,7 @@ export const PinInputRoot = (props) => {
     const [usePinInputProps, localProps] = createSplitProps()(props, [
         'autoFocus',
         'blurOnComplete',
+        'defaultValue',
         'disabled',
         'form',
         'id',

package/dist/source/components/pin-input/use-pin-input.js

@@ -1,11 +1,18 @@
 import * as pinInput from '@zag-js/pin-input';
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const usePinInput = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({ id: createUniqueId(), dir: locale().dir, getRootNode: environment().getRootNode }, props);
-    const [state, send] = useMachine(pinInput.machine(context), { context });
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
+        dir: locale().dir,
+        getRootNode: environment().getRootNode,
+        value: props.defaultValue,
+        ...props,
+    }));
+    const [state, send] = useMachine(pinInput.machine(context()), { context });
     return createMemo(() => pinInput.connect(state, send, normalizeProps));
 };

package/dist/source/components/popover/popover-root.jsx

@@ -7,8 +7,9 @@ export const PopoverRoot = (props) => {
     const [presenceProps, popoverProps] = splitPresenceProps(props);
     const [usePopoverProps, localProps] = createSplitProps()(popoverProps, [
         'autoFocus',
-        'closeOnEsc',
+        'closeOnEscape',
         'closeOnInteractOutside',
+        'defaultOpen',
         'id',
         'ids',
         'initialFocusEl',
@@ -19,6 +20,7 @@ export const PopoverRoot = (props) => {
         'onOpenChange',
         'onPointerDownOutside',
         'open',
+        'persistentElements',
         'portalled',
         'positioning',
     ]);

package/dist/source/components/popover/use-popover.js

@@ -1,16 +1,19 @@
 import * as popover from '@zag-js/popover';
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const usePopover = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({
-        id: createUniqueId(),
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
         dir: locale().dir,
         getRootNode: environment().getRootNode,
+        open: props.defaultOpen,
         'open.controlled': props.open !== undefined,
-    }, props);
-    const [state, send] = useMachine(popover.machine(context), { context });
+        ...props,
+    }));
+    const [state, send] = useMachine(popover.machine(context()), { context });
     return createMemo(() => popover.connect(state, send, normalizeProps));
 };

package/dist/source/components/presence/index.js

@@ -1,5 +1,4 @@
-import { Presence } from './presence';
-import { splitPresenceProps } from './split-presence-props';
-import { usePresence } from './use-presence';
-import { PresenceProvider, usePresenceContext, } from './use-presence-context';
-export { Presence, PresenceProvider, splitPresenceProps, usePresence, usePresenceContext };
+export { Presence } from './presence';
+export { splitPresenceProps } from './split-presence-props';
+export { usePresence } from './use-presence';
+export { PresenceProvider, usePresenceContext, } from './use-presence-context';

package/dist/source/components/progress/use-progress.js

@@ -1,11 +1,17 @@
 import * as progress from '@zag-js/progress';
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const useProgress = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({ id: createUniqueId(), dir: locale().dir, getRootNode: environment().getRootNode }, props);
-    const [state, send] = useMachine(progress.machine(context), { context });
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
+        dir: locale().dir,
+        getRootNode: environment().getRootNode,
+        ...props,
+    }));
+    const [state, send] = useMachine(progress.machine(context()), { context });
     return createMemo(() => progress.connect(state, send, normalizeProps));
 };

package/dist/source/components/radio-group/radio-group-root.jsx

@@ -5,6 +5,7 @@ import { useRadioGroup } from './use-radio-group';
 import { RadioGroupProvider } from './use-radio-group-context';
 export const RadioGroupRoot = (props) => {
     const [useRadioGroupProps, localProps] = createSplitProps()(props, [
+        'defaultValue',
         'disabled',
         'form',
         'id',

package/dist/source/components/radio-group/use-radio-group.js

@@ -1,12 +1,19 @@
 import * as radio from '@zag-js/radio-group';
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const useRadioGroup = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({ id: createUniqueId(), dir: locale().dir, getRootNode: environment().getRootNode }, props);
-    const [state, send] = useMachine(radio.machine(context), {
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
+        dir: locale().dir,
+        getRootNode: environment().getRootNode,
+        value: props.defaultValue,
+        ...props,
+    }));
+    const [state, send] = useMachine(radio.machine(context()), {
         context,
     });
     return createMemo(() => radio.connect(state, send, normalizeProps));

package/dist/source/components/rating-group/rating-group-root.jsx

@@ -8,6 +8,7 @@ export const RatingGroupRoot = (props) => {
         'allowHalf',
         'autoFocus',
         'count',
+        'defaultValue',
         'disabled',
         'form',
         'id',

package/dist/source/components/rating-group/use-rating-group.js

@@ -1,11 +1,18 @@
 import * as rating from '@zag-js/rating-group';
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const useRatingGroup = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({ id: createUniqueId(), dir: locale().dir, getRootNode: environment().getRootNode }, props);
-    const [state, send] = useMachine(rating.machine(context), { context });
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
+        dir: locale().dir,
+        getRootNode: environment().getRootNode,
+        value: props.defaultValue,
+        ...props,
+    }));
+    const [state, send] = useMachine(rating.machine(context()), { context });
     return createMemo(() => rating.connect(state, send, normalizeProps));
 };

package/dist/source/components/segment-group/segment-group-root.jsx

@@ -6,6 +6,7 @@ import { useSegmentGroup } from './use-segment-group';
 import { SegmentGroupProvider } from './use-segment-group-context';
 export const SegmentGroupRoot = (props) => {
     const [useSegmentGroupProps, localProps] = createSplitProps()(props, [
+        'defaultValue',
         'disabled',
         'form',
         'id',

package/dist/source/components/segment-group/use-segment-group.js

@@ -1,11 +1,18 @@
-import * as segment from '@zag-js/radio-group';
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import * as segmentGroup from '@zag-js/radio-group';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const useSegmentGroup = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({ id: createUniqueId(), dir: locale().dir, getRootNode: environment().getRootNode }, props);
-    const [state, send] = useMachine(segment.machine(context), { context });
-    return createMemo(() => segment.connect(state, send, normalizeProps));
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
+        dir: locale().dir,
+        getRootNode: environment().getRootNode,
+        value: props.defaultValue,
+        ...props,
+    }));
+    const [state, send] = useMachine(segmentGroup.machine(context()), { context });
+    return createMemo(() => segmentGroup.connect(state, send, normalizeProps));
 };

package/dist/source/components/select/select-item.jsx

@@ -6,7 +6,7 @@ import { useSelectContext } from './use-select-context';
 import { SelectItemProvider } from './use-select-item-context';
 import { SelectItemPropsProvider } from './use-select-item-props-context';
 export const SelectItem = (props) => {
-    const [itemProps, localProps] = createSplitProps()(props, ['item']);
+    const [itemProps, localProps] = createSplitProps()(props, ['item', 'persistFocus']);
     const select = useSelectContext();
     const mergedProps = mergeProps(() => select().getItemProps(itemProps), localProps);
     const itemState = createMemo(() => select().getItemState(itemProps));

package/dist/source/components/select/select-root.jsx

@@ -8,6 +8,9 @@ export const SelectRoot = (props) => {
     const [presenceProps, selectProps] = splitPresenceProps(props);
     const [useSelectProps, localProps] = createSplitProps()(selectProps, [
         'closeOnSelect',
+        'composite',
+        'defaultOpen',
+        'defaultValue',
         'disabled',
         'form',
         'highlightedValue',

package/dist/source/components/select/use-select.js

@@ -1,28 +1,30 @@
 import * as select from '@zag-js/select';
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 import { createSplitProps } from '../../utils/create-split-props';
 export const useSelect = (props) => {
-    const [collectionOptions, localProps] = createSplitProps()(props, [
+    const [collectionOptions, selectProps] = createSplitProps()(props, [
         'isItemDisabled',
         'itemToValue',
         'itemToString',
         'items',
     ]);
-    const collection = createMemo(() => select.collection(collectionOptions));
+    const collection = () => select.collection(collectionOptions);
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({
-        id: createUniqueId(),
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
+        collection: collection(),
         dir: locale().dir,
         getRootNode: environment().getRootNode,
+        open: props.defaultOpen,
+        value: props.defaultValue,
         'open.controlled': props.open !== undefined,
-        get collection() {
-            return collection();
-        },
-    }, localProps);
-    const [state, send] = useMachine(select.machine(context), {
+        ...selectProps,
+    }));
+    const [state, send] = useMachine(select.machine(context()), {
         context,
     });
     return createMemo(() => select.connect(state, send, normalizeProps));

package/dist/source/components/slider/slider-root.jsx

@@ -7,6 +7,7 @@ export const SliderRoot = (props) => {
     const [useSliderProps, localProps] = createSplitProps()(props, [
         'aria-label',
         'aria-labelledby',
+        'defaultValue',
         'disabled',
         'form',
         'getAriaValueText',

package/dist/source/components/slider/use-slider.js

@@ -1,11 +1,18 @@
 import * as slider from '@zag-js/slider';
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const useSlider = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({ id: createUniqueId(), dir: locale().dir, getRootNode: environment().getRootNode }, props);
-    const [state, send] = useMachine(slider.machine(context), { context });
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
+        dir: locale().dir,
+        getRootNode: environment().getRootNode,
+        value: props.defaultValue,
+        ...props,
+    }));
+    const [state, send] = useMachine(slider.machine(context()), { context });
     return createMemo(() => slider.connect(state, send, normalizeProps));
 };

package/dist/source/components/splitter/splitter-root.jsx

@@ -5,6 +5,7 @@ import { useSplitter } from './use-splitter';
 import { SplitterProvider } from './use-splitter-context';
 export const SplitterRoot = (props) => {
     const [useSplitterProps, localProps] = createSplitProps()(props, [
+        'defaultSize',
         'id',
         'ids',
         'onSizeChange',

package/dist/source/components/splitter/use-splitter.js

@@ -1,11 +1,18 @@
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import * as splitter from '@zag-js/splitter';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const useSplitter = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({ id: createUniqueId(), dir: locale().dir, getRootNode: environment().getRootNode }, props);
-    const [state, send] = useMachine(splitter.machine(context), { context });
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
+        dir: locale().dir,
+        getRootNode: environment().getRootNode,
+        size: props.defaultSize,
+        ...props,
+    }));
+    const [state, send] = useMachine(splitter.machine(context()), { context });
     return createMemo(() => splitter.connect(state, send, normalizeProps));
 };

package/dist/source/components/switch/switch-root.jsx

@@ -6,6 +6,7 @@ import { SwitchProvider } from './use-switch-context';
 export const SwitchRoot = (props) => {
     const [switchProps, localProps] = createSplitProps()(props, [
         'checked',
+        'defaultChecked',
         'disabled',
         'form',
         'id',

package/dist/source/components/switch/use-switch.js

@@ -1,11 +1,18 @@
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import * as zagSwitch from '@zag-js/switch';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const useSwitch = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({ id: createUniqueId(), dir: locale().dir, getRootNode: environment().getRootNode }, props);
-    const [state, send] = useMachine(zagSwitch.machine(context), { context });
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
+        dir: locale().dir,
+        getRootNode: environment().getRootNode,
+        checked: props.defaultChecked,
+        ...props,
+    }));
+    const [state, send] = useMachine(zagSwitch.machine(context()), { context });
     return createMemo(() => zagSwitch.connect(state, send, normalizeProps));
 };

package/dist/source/components/tabs/tabs-root.jsx

@@ -8,6 +8,8 @@ export const TabsRoot = (props) => {
     const [renderStrategyProps, tabsProps] = splitRenderStrategyProps(props);
     const [useTabsProps, restProps] = createSplitProps()(tabsProps, [
         'activationMode',
+        'composite',
+        'defaultValue',
         'id',
         'ids',
         'loopFocus',

package/dist/source/components/tabs/use-tabs.js

@@ -1,11 +1,18 @@
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import * as tabs from '@zag-js/tabs';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const useTabs = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({ id: createUniqueId(), dir: locale().dir, getRootNode: environment().getRootNode }, props);
-    const [state, send] = useMachine(tabs.machine(context), { context });
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
+        dir: locale().dir,
+        getRootNode: environment().getRootNode,
+        value: props.defaultValue,
+        ...props,
+    }));
+    const [state, send] = useMachine(tabs.machine(context()), { context });
     return createMemo(() => tabs.connect(state, send, normalizeProps));
 };

package/dist/source/components/tags-input/tags-input-root.jsx

@@ -10,6 +10,7 @@ export const TagsInputRoot = (props) => {
         'autoFocus',
         'blurBehavior',
         'delimiter',
+        'defaultValue',
         'disabled',
         'editable',
         'form',

package/dist/source/components/tags-input/use-tags-input.js

@@ -1,11 +1,18 @@
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import * as tagsInput from '@zag-js/tags-input';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const useTagsInput = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({ id: createUniqueId(), dir: locale().dir, getRootNode: environment().getRootNode }, props);
-    const [state, send] = useMachine(tagsInput.machine(context), { context });
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
+        dir: locale().dir,
+        getRootNode: environment().getRootNode,
+        value: props.defaultValue,
+        ...props,
+    }));
+    const [state, send] = useMachine(tagsInput.machine(context()), { context });
     return createMemo(() => tagsInput.connect(state, send, normalizeProps));
 };

package/dist/source/components/toggle-group/toggle-group-root.jsx

@@ -5,6 +5,7 @@ import { useToggleGroup } from './use-toggle-group';
 import { ToggleGroupProvider } from './use-toggle-group-context';
 export const ToggleGroupRoot = (props) => {
     const [useToggleGroupProps, restProps] = createSplitProps()(props, [
+        'defaultValue',
         'disabled',
         'id',
         'ids',

package/dist/source/components/toggle-group/use-toggle-group.js

@@ -1,12 +1,19 @@
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import * as toggleGroup from '@zag-js/toggle-group';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const useToggleGroup = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({ id: createUniqueId(), dir: locale().dir, getRootNode: environment().getRootNode }, props);
-    const [state, send] = useMachine(toggleGroup.machine(context), {
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
+        dir: locale().dir,
+        getRootNode: environment().getRootNode,
+        value: props.defaultValue,
+        ...props,
+    }));
+    const [state, send] = useMachine(toggleGroup.machine(context()), {
         context,
     });
     return createMemo(() => toggleGroup.connect(state, send, normalizeProps));

package/dist/source/components/tooltip/tooltip-root.jsx

@@ -8,8 +8,9 @@ export const TooltipRoot = (props) => {
     const [useTooltipProps, localProps] = createSplitProps()(tooltipProps, [
         'aria-label',
         'closeDelay',
-        'closeOnEsc',
+        'closeOnEscape',
         'closeOnPointerDown',
+        'defaultOpen',
         'disabled',
         'id',
         'ids',

package/dist/source/components/tooltip/use-tooltip.js

@@ -1,16 +1,19 @@
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import * as tooltip from '@zag-js/tooltip';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const useTooltip = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({
-        id: createUniqueId(),
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
         dir: locale().dir,
         getRootNode: environment().getRootNode,
+        open: props.defaultOpen,
         'open.controlled': props.open !== undefined,
-    }, props);
-    const [state, send] = useMachine(tooltip.machine(context), { context });
+        ...props,
+    }));
+    const [state, send] = useMachine(tooltip.machine(context()), { context });
     return createMemo(() => tooltip.connect(state, send, normalizeProps));
 };

package/dist/source/components/tree-view/tree-view-root.jsx

@@ -5,14 +5,16 @@ import { useTreeView } from './use-tree-view';
 import { TreeViewProvider } from './use-tree-view-context';
 export const TreeViewRoot = (props) => {
     const [useTreeViewProps, localProps] = createSplitProps()(props, [
+        'defaultExpandedValue',
+        'defaultSelectedValue',
         'expandedValue',
+        'expandOnClick',
         'focusedValue',
         'id',
         'ids',
         'onExpandedChange',
         'onFocusChange',
         'onSelectionChange',
-        'openOnClick',
         'selectedValue',
         'selectionMode',
         'typeahead',

package/dist/source/components/tree-view/use-tree-view.js

@@ -1,11 +1,19 @@
-import { mergeProps, normalizeProps, useMachine } from '@zag-js/solid';
+import { normalizeProps, useMachine } from '@zag-js/solid';
 import * as treeView from '@zag-js/tree-view';
 import { createMemo, createUniqueId } from 'solid-js';
 import { useEnvironmentContext, useLocaleContext } from '../../providers';
 export const useTreeView = (props) => {
     const locale = useLocaleContext();
     const environment = useEnvironmentContext();
-    const context = mergeProps({ id: createUniqueId(), dir: locale().dir, getRootNode: environment().getRootNode }, props);
-    const [state, send] = useMachine(treeView.machine(context), { context });
+    const id = createUniqueId();
+    const context = createMemo(() => ({
+        id,
+        dir: locale().dir,
+        getRootNode: environment().getRootNode,
+        selectedValue: props.defaultSelectedValue,
+        expandedValue: props.defaultExpandedValue,
+        ...props,
+    }));
+    const [state, send] = useMachine(treeView.machine(context()), { context });
     return createMemo(() => treeView.connect(state, send, normalizeProps));
 };

package/dist/source/providers/environment/{environment.jsx → environment-provider.jsx}

@@ -1,8 +1,8 @@
 import { getDocument, getWindow } from '@zag-js/dom-query';
 import { Show, createMemo, createSignal } from 'solid-js';
 import { runIfFn } from '../../utils/run-if-fn';
-import { EnvironmentProvider } from './use-environment-context';
-export const Environment = (props) => {
+import { EnvironmentContextProvider } from './use-environment-context';
+export const EnvironmentProvider = (props) => {
     const [spanRef, setSpanRef] = createSignal();
     const getRootNode = () => runIfFn(props.value) ?? spanRef()?.ownerDocument ?? document;
     const environment = createMemo(() => ({
@@ -10,10 +10,10 @@ export const Environment = (props) => {
         getDocument: () => getDocument(getRootNode()),
         getWindow: () => getWindow(getRootNode()),
     }));
-    return (<EnvironmentProvider value={environment}>
+    return (<EnvironmentContextProvider value={environment}>
       {props.children}
       <Show when={!props.value}>
         <span hidden ref={setSpanRef}/>
       </Show>
-    </EnvironmentProvider>);
+    </EnvironmentContextProvider>);
 };

package/dist/source/providers/environment/index.js

@@ -1,2 +1,2 @@
-export { Environment } from './environment';
+export { EnvironmentProvider } from './environment-provider';
 export { useEnvironmentContext, } from './use-environment-context';

package/dist/source/providers/environment/use-environment-context.js

@@ -1,5 +1,5 @@
 import { createContext } from '../../utils/create-context';
-export const [EnvironmentProvider, useEnvironmentContext] = createContext({
+export const [EnvironmentContextProvider, useEnvironmentContext] = createContext({
     hookName: 'useEnvironmentContext',
     providerName: '<EnvironmentProvider />',
     strict: false,