From a881c73fc401eefaa36551bec8cb58a997f7b68e Mon Sep 17 00:00:00 2001 From: Hunter Perrin Date: Sat, 11 Sep 2021 22:08:16 -0700 Subject: [PATCH] feat: migrate dialog to typescript --- packages/dialog/{Actions.js => Actions.ts} | 3 +- packages/dialog/{Content.js => Content.ts} | 3 +- packages/dialog/Dialog.svelte | 65 +- packages/dialog/{Header.js => Header.ts} | 3 +- .../{InitialFocus.js => InitialFocus.ts} | 2 +- packages/dialog/{Title.js => Title.ts} | 3 +- packages/dialog/ambient.d.ts | 7 + packages/dialog/bare.js | 2 - packages/dialog/bare.ts | 2 + packages/dialog/index.js | 11 - packages/dialog/index.ts | 11 + packages/dialog/package-lock.json | 689 +----------------- packages/dialog/package.json | 7 +- packages/dialog/styled.js | 3 - packages/dialog/styled.ts | 3 + packages/dialog/tsconfig.json | 10 + .../routes/demo/dialog/_DefaultFocus.svelte | 4 +- .../site/src/routes/demo/dialog/_Event.svelte | 6 +- .../src/routes/demo/dialog/_Fullscreen.svelte | 6 +- .../routes/demo/dialog/_LargeScroll.svelte | 4 +- .../site/src/routes/demo/dialog/_List.svelte | 9 +- .../src/routes/demo/dialog/_Mandatory.svelte | 4 +- .../routes/demo/dialog/_ManyActions.svelte | 4 +- .../routes/demo/dialog/_OverFullscreen.svelte | 10 +- .../src/routes/demo/dialog/_Selection.svelte | 6 +- .../src/routes/demo/dialog/_Simple.svelte | 4 +- .../src/routes/demo/dialog/_Sliders.svelte | 4 +- .../site/src/routes/demo/dialog/index.svelte | 2 +- 28 files changed, 130 insertions(+), 757 deletions(-) rename packages/dialog/{Actions.js => Actions.ts} (77%) rename packages/dialog/{Content.js => Content.ts} (65%) rename packages/dialog/{Header.js => Header.ts} (72%) rename packages/dialog/{InitialFocus.js => InitialFocus.ts} (73%) rename packages/dialog/{Title.js => Title.ts} (64%) create mode 100644 packages/dialog/ambient.d.ts delete mode 100644 packages/dialog/bare.js create mode 100644 packages/dialog/bare.ts delete mode 100644 packages/dialog/index.js create mode 100644 packages/dialog/index.ts delete mode 100644 packages/dialog/styled.js create mode 100644 packages/dialog/styled.ts create mode 100644 packages/dialog/tsconfig.json diff --git a/packages/dialog/Actions.js b/packages/dialog/Actions.ts similarity index 77% rename from packages/dialog/Actions.js rename to packages/dialog/Actions.ts index ad68ab787..d7b15d6ee 100644 --- a/packages/dialog/Actions.js +++ b/packages/dialog/Actions.ts @@ -1,9 +1,10 @@ +import type { SMUIComponent } from '@smui/common'; import { classAdderBuilder } from '@smui/common/internal'; import Div from '@smui/common/Div.svelte'; export default classAdderBuilder({ class: 'mdc-dialog__actions', - component: Div, + component: Div as typeof SMUIComponent, classMap: { 'smui-dialog__actions--reversed': 'SMUI:dialog:actions:reversed', }, diff --git a/packages/dialog/Content.js b/packages/dialog/Content.ts similarity index 65% rename from packages/dialog/Content.js rename to packages/dialog/Content.ts index 88991efea..78fcf0883 100644 --- a/packages/dialog/Content.js +++ b/packages/dialog/Content.ts @@ -1,7 +1,8 @@ +import type { SMUIComponent } from '@smui/common'; import { classAdderBuilder } from '@smui/common/internal'; import Div from '@smui/common/Div.svelte'; export default classAdderBuilder({ class: 'mdc-dialog__content', - component: Div, + component: Div as typeof SMUIComponent, }); diff --git a/packages/dialog/Dialog.svelte b/packages/dialog/Dialog.svelte index 89f53ae86..7897669d4 100644 --- a/packages/dialog/Dialog.svelte +++ b/packages/dialog/Dialog.svelte @@ -58,11 +58,12 @@ - diff --git a/packages/site/src/routes/demo/dialog/_Event.svelte b/packages/site/src/routes/demo/dialog/_Event.svelte index 48b78f456..152fa33f3 100644 --- a/packages/site/src/routes/demo/dialog/_Event.svelte +++ b/packages/site/src/routes/demo/dialog/_Event.svelte @@ -24,14 +24,14 @@
Response: {response}
- diff --git a/packages/site/src/routes/demo/dialog/_List.svelte b/packages/site/src/routes/demo/dialog/_List.svelte index 1fbec4a8b..e02fb551d 100644 --- a/packages/site/src/routes/demo/dialog/_List.svelte +++ b/packages/site/src/routes/demo/dialog/_List.svelte @@ -23,13 +23,14 @@ -
Clicked: {clicked}{clicked === 69 ? ', nice' : ''}
+
Clicked: {clicked}{clicked === 69 ? ', nice' : clicked === 42 ? ', life, the universe, and everything' : ''}
- diff --git a/packages/site/src/routes/demo/dialog/_Mandatory.svelte b/packages/site/src/routes/demo/dialog/_Mandatory.svelte index 902e4ff7e..23b6ac4d1 100644 --- a/packages/site/src/routes/demo/dialog/_Mandatory.svelte +++ b/packages/site/src/routes/demo/dialog/_Mandatory.svelte @@ -32,10 +32,10 @@
Result: {response}
- diff --git a/packages/site/src/routes/demo/dialog/_ManyActions.svelte b/packages/site/src/routes/demo/dialog/_ManyActions.svelte index 9d961fc5b..0036182bb 100644 --- a/packages/site/src/routes/demo/dialog/_ManyActions.svelte +++ b/packages/site/src/routes/demo/dialog/_ManyActions.svelte @@ -30,10 +30,10 @@
Action: {buttoned}
- diff --git a/packages/site/src/routes/demo/dialog/_OverFullscreen.svelte b/packages/site/src/routes/demo/dialog/_OverFullscreen.svelte index 0b6be0900..6e42fa7cf 100644 --- a/packages/site/src/routes/demo/dialog/_OverFullscreen.svelte +++ b/packages/site/src/routes/demo/dialog/_OverFullscreen.svelte @@ -70,7 +70,7 @@
Response: {response}, Selected: {selected}
- diff --git a/packages/site/src/routes/demo/dialog/_Sliders.svelte b/packages/site/src/routes/demo/dialog/_Sliders.svelte index d11112c5c..b3799adeb 100644 --- a/packages/site/src/routes/demo/dialog/_Sliders.svelte +++ b/packages/site/src/routes/demo/dialog/_Sliders.svelte @@ -39,13 +39,13 @@ -