Merge pull request #33534 from denisname/bootstrap-4.3

Update to bootstrap 4.3

types/bootstrap/bootstrap-tests.ts

@@ -196,6 +196,12 @@ $("#popover").popover({
     offset: 10,
     fallbackPlacement: ["flip", "clockwise"],
     boundary: "scrollParent",
+    sanitize: false,
+    whiteList: {
+        h1: [],
+        img: ['src', 'alt', 'title', 'width', 'height'],
+    },
+    sanitizeFn: (x: string) => x.replace("<", ""),
 });
 
 $("#popover").popover({
@@ -207,6 +213,10 @@ $("#popover").popover({
     },
 });
 
+$("#popover").popover({
+    sanitizeFn: null,
+});
+
 // --------------------------------------------------------------------------------------
 // Scrollspy
 // --------------------------------------------------------------------------------------
@@ -280,10 +290,23 @@ $("#tooltip").on("hide.bs.tooltip", () => {});
 
 $("#tooltip").tooltip({
     animation: false,
-});
-
-$("#tooltip").tooltip({
     container: "#container",
+    delay: {show: 500, hide: 100},
+    html: true,
+    placement: "auto",
+    selector: "[rel=\"tooltip\"]",
+    template: '<div class="tooltip empty" role="tooltip"></div>',
+    title: "Hello world",
+    trigger: "hover focus",
+    offset: 10,
+    fallbackPlacement: ["flip", "clockwise"],
+    boundary: "scrollParent",
+    sanitize: false,
+    whiteList: {
+        h1: [],
+        img: ['src', 'alt', 'title', 'width', 'height'],
+    },
+    sanitizeFn: (x: string) => x.replace("<", ""),
 });
 
 $("#tooltip").tooltip({
@@ -298,18 +321,6 @@ $("#tooltip").tooltip({
     delay: 250,
 });
 
-$("#tooltip").tooltip({
-    delay: {show: 500, hide: 100},
-});
-
-$("#tooltip").tooltip({
-    html: true,
-});
-
-$("#tooltip").tooltip({
-    placement: "auto",
-});
-
 $("#tooltip").tooltip({
     placement(this, tooltip, trigger) {
         console.log(this.tip === tooltip);
@@ -327,22 +338,10 @@ $("#tooltip").tooltip({
     },
 });
 
-$("#tooltip").tooltip({
-    selector: "[rel=\"tooltip\"]",
-});
-
 $("#tooltip").tooltip({
     selector: false,
 });
 
-$("#tooltip").tooltip({
-    template: '<div class="tooltip empty" role="tooltip"></div>',
-});
-
-$("#tooltip").tooltip({
-    title: "Hello world",
-});
-
 $("#tooltip").tooltip({
     title: document.getElementById("title-element") as HTMLElement,
 });
@@ -353,14 +352,6 @@ $("#tooltip").tooltip({
     },
 });
 
-$("#tooltip").tooltip({
-    trigger: "hover focus",
-});
-
-$("#tooltip").tooltip({
-    offset: 10,
-});
-
 $("#tooltip").tooltip({
     offset: "10px",
 });
@@ -369,14 +360,10 @@ $("#tooltip").tooltip({
     fallbackPlacement: "clockwise",
 });
 
-$("#tooltip").tooltip({
-    fallbackPlacement: ["flip", "clockwise"],
-});
-
-$("#tooltip").tooltip({
-    boundary: "scrollParent",
-});
-
 $("#tooltip").tooltip({
     boundary: aHtmlElement,
 });
+
+$("#popover").popover({
+    sanitizeFn: null,
+});

types/bootstrap/index.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for Bootstrap 4.2
+// Type definitions for Bootstrap 4.3
 // Project: https://github.com/twbs/bootstrap/, https://getbootstrap.com
 // Definitions by: denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -352,6 +352,25 @@ export interface TooltipOption {
      * @default "scrollParent"
      */
     boundary?: Popper.Boundary | HTMLElement;
+
+    /**
+     * Enable or disable the sanitization. If activated 'template', 'content' and 'title' options will be sanitized.
+     *
+     * @default true
+     */
+    sanitize?: boolean;
+
+    /**
+     * Object which contains allowed attributes and tags.
+     */
+    whiteList?: {[key: string]: string[]};
+
+    /**
+     * Here you can supply your own sanitize function. This can be useful if you prefer to use a dedicated library to perform sanitization.
+     *
+     * @default null
+     */
+    sanitizeFn?: null | ((input: string) => string);
 }
 
 // --------------------------------------------------------------------------------------