Skip to content

Commit 98887a2

Browse files
committed
chore(modal): Renamed modal service and template component
1 parent 9af3ffa commit 98887a2

File tree

5 files changed

+18
-17
lines changed

5 files changed

+18
-17
lines changed

apps/solid/src/routes/dialog.route.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
Container,
44
Divider,
55
Heading,
6-
ModalDialog,
6+
Modal,
77
ConfirmModal,
88
ModalPortal,
99
} from '@spuxx/solid';
@@ -20,9 +20,9 @@ export const DialogRoute: Component = () => {
2020
<Divider color="gradient" />
2121
<Button
2222
onClick={() => {
23-
ModalDialog.show(ConfirmModal, {
23+
Modal.show(ConfirmModal, {
2424
title: 'Hello World!',
25-
color: 'gradient',
25+
// color: 'gradient',
2626
content: `Cum consequatur occaecati dolorem quo ducimus harum est placeat.
2727
Quam perspiciatis exercitationem animi ut.
2828
Dolorem eum rerum labore. Sit est facere ratione.

packages/solid/src/modal/built-in/confirm.modal.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ModalComponent, ModalOptions } from '../modal.types';
22
import { ModalHeader } from '../template/modal-header.component';
3-
import { Modal } from '../template/modal.component';
3+
import { ModalTemplate } from '../template/modal-template.component';
44
import { ModalBody } from '../template/modal-body.component';
55
import { ModalFooter } from '../template/modal-footer.component';
66
import { Button } from '../../components/input/button';
@@ -63,7 +63,7 @@ export const ConfirmModal: ModalComponent<ConfirmModalOptions> = (options) => {
6363
const { confirmColor = 'primary', cancelColor = 'primary' } = options;
6464

6565
return (
66-
<Modal {...options}>
66+
<ModalTemplate {...options}>
6767
<ModalHeader
6868
icon={options.icon}
6969
title={options.title}
@@ -86,6 +86,6 @@ export const ConfirmModal: ModalComponent<ConfirmModalOptions> = (options) => {
8686
<b>{options.confirmLabel}</b>
8787
</Button>
8888
</ModalFooter>
89-
</Modal>
89+
</ModalTemplate>
9090
);
9191
};

packages/solid/src/modal/modal-dialog.service.tsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@ import { ServiceMixin } from '@spuxx/js-utils';
22
import { ComponentProps } from 'solid-js';
33
import { ModalComponent, ModalOptions } from './modal.types';
44
import { render } from 'solid-js/web';
5+
import { ConfirmModal } from '@spuxx/solid';
56

67
/**
7-
* The `ModalDialog` service provides global access to modal dialogs.
8+
* The `Modal` service provides global access to modal dialogs.
89
* @example
910
* ```tsx
1011
* // Provide ModalPortal somewhere in your application
11-
* import { ModalDialog, ModalPortal, ConfirmModal } from '@spuxx/solid';
12+
* import { Modal, ModalPortal, ConfirmModal } from '@spuxx/solid';
1213
* <MoalPortal />
1314
*
1415
* // Show a modal dialog
15-
* ModalDialog.show(ConfirmModal, { title: 'Hello World!' });
16+
* Modal.show(ConfirmModal, { title: 'Hello World!' });
1617
* ```
1718
*/
18-
export class ModalDialog extends ServiceMixin<ModalDialog>() {
19+
export class Modal extends ServiceMixin<Modal>() {
1920
protected portal: Node | undefined;
2021
protected dispose = () => {};
2122

packages/solid/src/modal/modal-portal.component.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, createEffect } from 'solid-js';
2-
import { ModalDialog } from './modal-dialog.service';
2+
import { Modal } from './modal-dialog.service';
33

44
/**
55
* Place this component anywhere in your application to make it the portal node for modals.
@@ -15,7 +15,7 @@ export const ModalPortal: Component = () => {
1515

1616
createEffect(() => {
1717
if (portal) {
18-
ModalDialog.setPortal(portal);
18+
Modal.setPortal(portal);
1919
}
2020
});
2121

packages/solid/src/modal/template/modal.component.tsx packages/solid/src/modal/template/modal-template.component.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, ParentProps } from 'solid-js';
2-
import { ModalDialog } from '../modal-dialog.service';
2+
import { Modal } from '../modal-dialog.service';
33
import { ModalOptions } from '../modal.types';
44
import { Content, Overlay, Portal, Root } from '@corvu/dialog';
55

@@ -10,7 +10,7 @@ interface Props extends ModalOptions, ParentProps {}
1010
* @param options {@link ModalOptions}
1111
* @example
1212
* ```tsx
13-
* import { Modal, ModalHeader, ModalBody, ModalFooter, Button } from '@spuxx/solid';
13+
* import { ModalTemplate, ModalHeader, ModalBody, ModalFooter, Button } from '@spuxx/solid';
1414
* export const MyModal = (options) => {
1515
* return (
1616
* <Modal {...options}>
@@ -24,11 +24,11 @@ interface Props extends ModalOptions, ParentProps {}
2424
* }
2525
* ```
2626
*/
27-
export const Modal: Component<Props> = (options) => {
27+
export const ModalTemplate: Component<Props> = (options) => {
2828
const { size = 'auto', preventClose = false, onClose } = options;
2929

3030
const handleContentPresentChange = (value: boolean) => {
31-
if (!value) ModalDialog.close();
31+
if (!value) Modal.close();
3232
if (typeof onClose === 'function') onClose();
3333
};
3434

@@ -42,7 +42,7 @@ export const Modal: Component<Props> = (options) => {
4242
closeOnOutsidePointer={!preventClose}
4343
onContentPresentChange={handleContentPresentChange}
4444
>
45-
<Portal mount={ModalDialog.portal} forceMount={true}>
45+
<Portal mount={Modal.portal} forceMount={true}>
4646
<Overlay class="spx-modal-overlay" />
4747
<Content class="spx-modal" data-size={size}>
4848
{options.children}

0 commit comments

Comments
 (0)