Add typing to Margin.ts and MarginInline.ts.

src/elements/CopyableInputBox.ts

@@ -1,4 +1,4 @@
-import { MarginInline } from "./MarginInline.js";
+import { MarginInline } from "./MarginInline";
 import { addClipboardNotifications } from "../pageUtils";
 import { makeElement } from "../htmlUtils";
 import ClipboardJS from "clipboard";

src/elements/Margin.ts

@@ -1,10 +1,9 @@
 import { makeElement } from "../htmlUtils";
 
-export function Margin(children, options = {}) {
+export function Margin(children: null | Element | (Element | null[])): Element {
   return makeElement({
     tag: "div",
     class: "uk-margin",
-    children: children,
+    children: children
-    ...options
   });
 }

src/elements/MarginInline.ts

@@ -1,6 +1,6 @@
 import { makeElement } from "../htmlUtils";
 
-export function MarginInline(children, marginOptions = {}, inlineOptions = {}) {
+export function MarginInline(children: null | Element | (Element | null[])): Element {
   return makeElement({
     tag: "div",
     class: "uk-margin",
@@ -8,8 +8,6 @@ export function MarginInline(children, marginOptions = {}, inlineOptions = {}) {
       tag: "div",
       class: "uk-inline",
       children: children,
-      ...inlineOptions,
     }),
-    ...marginOptions,
   });
 }

src/elements/QRScanner.js

@@ -1,4 +1,4 @@
-import { Margin } from "./Margin.js";
+import { Margin } from "./Margin";
 import { makeElement } from "../htmlUtils";
 import QrScanner from 'qr-scanner';
 

src/htmlUtils.ts

@@ -17,7 +17,7 @@ const optionsFunctions: optionsFunctionsObject = {
   "onclick": (e: HTMLButtonElement, arg: any) => e.onclick = arg,
   "attributes": setElementAttributes,
   "text": (e: HTMLParagraphElement, arg: string) => e.innerText = arg,
-  "children": (e: Element, arg: null | Element | (Element | null[])) => {
+  "children": (e: Element, arg: Element | Element[]) => {
     if (Array.isArray(arg)) {
       arg.forEach(child => {
         if (child != null) e.appendChild(child);
@@ -38,6 +38,7 @@ interface ElementInfo {
   attributes?: {
     [propName: string]: any
   };
+  children?: Element | Element[];
   text?: string;
   thenRun?: (e: Element) => void;
   [propName: string]: any;

src/pages/Login.js

@@ -1,5 +1,5 @@
-import { Margin } from "../elements/Margin.js";
+import { Margin } from "../elements/Margin";
-import { MarginInline } from "../elements/MarginInline.js";
+import { MarginInline } from "../elements/MarginInline";
 import { Page } from "../types/Page";
 import { changePage, setErrorText, setPageContent } from "../pageUtils";
 import { lookupSelf } from "../api/lookupSelf";

src/pages/PwGen.js

@@ -1,5 +1,5 @@
 import { CopyableInputBox } from "../elements/CopyableInputBox";
-import { Margin } from "../elements/Margin.js";
+import { Margin } from "../elements/Margin";
 import { Page } from "../types/Page";
 import { makeElement } from "../htmlUtils";
 import { setPageContent } from "../pageUtils";

src/pages/SetLanguage.js

@@ -1,4 +1,4 @@
-import { Margin } from "../elements/Margin.js";
+import { Margin } from "../elements/Margin";
 import { Page } from "../types/Page";
 import { changePage, setPageContent } from "../pageUtils";
 import { makeElement } from "../htmlUtils";

src/pages/TOTP/NewTOTP.js

@@ -1,5 +1,5 @@
-import { Margin } from "../../elements/Margin.js";
+import { Margin } from "../../elements/Margin";
-import { MarginInline } from "../../elements/MarginInline.js";
+import { MarginInline } from "../../elements/MarginInline";
 import { Page } from "../../types/Page";
 import { addNewTOTP } from "../../api/addNewTOTP";
 import { changePage, setErrorText, setPageContent, setTitleElement } from "../../pageUtils";

src/pages/Transit/TransitDecrypt.js

@@ -1,5 +1,5 @@
 import { CopyableModal } from "../../elements/CopyableModal";
-import { Margin } from "../../elements/Margin.js";
+import { Margin } from "../../elements/Margin";
 import { Page } from "../../types/Page";
 import { changePage, setErrorText, setPageContent, setTitleElement } from "../../pageUtils";
 import { makeElement } from "../../htmlUtils";

src/pages/Transit/TransitEncrypt.js

@@ -1,5 +1,5 @@
 import { CopyableModal } from "../../elements/CopyableModal";
-import { Margin } from "../../elements/Margin.js";
+import { Margin } from "../../elements/Margin";
 import { Page } from "../../types/Page";
 import { changePage, setErrorText, setPageContent, setTitleElement } from "../../pageUtils";
 import { makeElement } from "../../htmlUtils";

src/pages/Unseal.js

@@ -1,4 +1,4 @@
-import { MarginInline } from "../elements/MarginInline.js";
+import { MarginInline } from "../elements/MarginInline";
 import { Page } from "../types/Page";
 import { QRScanner } from "../elements/QRScanner.js";
 import { changePage, setErrorText, setPageContent } from "../pageUtils";