Merge pull request t4t5#774 from alex-osman/fix-typings

Fix Button Interface Typings
HierarchYang · Dec 14, 2017 · ea032a7 · ea032a7
2 parents 1086356 + 0b5a6a6
commit ea032a7
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 21 deletions.
diff --git a/src/modules/init/buttons.ts b/src/modules/init/buttons.ts
@@ -74,7 +74,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/content.ts b/src/modules/init/content.ts
@@ -30,14 +30,12 @@ const addInputEvents = (input: HTMLElement): void => {
 
   /*
    * FIXME (this is a bit hacky)
-   * Set the focus to the input
-   * Overwrite the submit value with the 
-   * value of the input element ("" or value/defaultValue)
+   * We're overwriting the default value of confirm button,
+   * as well as overwriting the default focus on the button
    */
   setTimeout(() => {
     input.focus();
-    const defaultValue = (input as HTMLInputElement).value;
-    setActionValue(defaultValue)
+    setActionValue('');
   }, 0);
 
 };

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/src/modules/options/buttons.ts b/src/modules/options/buttons.ts
@@ -1,15 +1,15 @@
 import { isPlainObject, throwErr } from '../utils';
 
 export interface ButtonOptions {
-  visible: boolean,
-  text: string,
-  value: any,
-  className: string | Array<string>,
-  closeModal: boolean,
+  visible?: boolean,
+  text?: string,
+  value?: any,
+  className?: string | Array<string>,
+  closeModal?: boolean,
 };
 
 export interface ButtonList {
-  [buttonNamespace: string]: ButtonOptions,
+  [buttonNamespace: string]: ButtonOptions | boolean,
 };
 
 export const CONFIRM_KEY = 'confirm';

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

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 | Array<string>;
-    closeModal: boolean;
+    visible?: boolean;
+    text?: string;
+    value?: any;
+    className?: string | Array<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;