have to explicitly cast some things

HierarchYang · Nov 20, 2017 · 2c7d4fd · 2c7d4fd
1 parent 35173c1
commit 2c7d4fd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/modules/init/buttons.ts b/src/modules/init/buttons.ts
@@ -67,7 +67,7 @@ const initButtons = (buttons: ButtonList, dangerMode: boolean): void => {
   const footerEl: Element = injectElIntoModal(footerMarkup);
 
   for (let key in buttons) {
-    const buttonOpts: ButtonOptions = buttons[key];
+    const buttonOpts: ButtonOptions = buttons[key] as ButtonOptions;
     const buttonEl: Node = getButton(key, buttonOpts, dangerMode);
 
     if (buttonOpts.visible) {

diff --git a/src/modules/init/modal.ts b/src/modules/init/modal.ts
@@ -1,3 +1,4 @@
+import { ButtonList } from './../options/buttons';
 import { stringToNode, getNode } from '../utils';
 import { modalMarkup } from '../markup';
 import { SwalOptions } from '../options';
@@ -54,7 +55,7 @@ export const initModalContent = (opts: SwalOptions): void => {
   initTitle(opts.title);
   initText(opts.text);
   initContent(opts.content);
-  initButtons(opts.buttons, opts.dangerMode);
+  initButtons(opts.buttons as ButtonList, opts.dangerMode);
 };
 
 const initModalOnce = (): void => {

diff --git a/typings/modules/options/buttons.d.ts b/typings/modules/options/buttons.d.ts
@@ -1,12 +1,12 @@
 export interface ButtonOptions {
-    visible: boolean;
-    text: string;
-    value: any;
-    className: string;
-    closeModal: boolean;
+    visible?: boolean;
+    text?: string;
+    value?: any;
+    className?: string;
+    closeModal?: boolean;
 }
 export interface ButtonList {
-    [buttonNamespace: string]: ButtonOptions;
+    [buttonNamespace: string]: ButtonOptions | boolean;
 }
 export declare const CONFIRM_KEY = "confirm";
 export declare const CANCEL_KEY = "cancel";

diff --git a/typings/modules/options/index.d.ts b/typings/modules/options/index.d.ts
@@ -4,7 +4,7 @@ export interface SwalOptions {
     title: string;
     text: string;
     icon: string;
-    buttons: ButtonList;
+    buttons: ButtonList | Array<string | boolean>;
     content: ContentOptions;
     className: string;
     closeOnClickOutside: boolean;