gd-bs 5.2.6 → 5.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "gd-bs",
-    "version": "5.2.6",
+    "version": "5.2.7",
     "description": "Bootstrap JavaScript, TypeScript and Web Components library.",
     "main": "build/index.js",
     "typings": "src/index.d.ts",

package/src/components/tooltip/index.ts

@@ -147,14 +147,14 @@ class _Tooltip extends Base<ITooltipProps> {
         // Set the theme
         let theme = null;
         switch (this.props.type) {
-            // Dark
-            case TooltipTypes.Dark:
-                theme = "dark";
-                break;
             // Danger
             case TooltipTypes.Danger:
                 theme = "danger";
                 break;
+            // Dark
+            case TooltipTypes.Dark:
+                theme = "dark";
+                break;
             // Info
             case TooltipTypes.Info:
                 theme = "info";
@@ -192,7 +192,60 @@ class _Tooltip extends Base<ITooltipProps> {
                 break;
             // Default - Secondary
             default:
+                // Set the default theme
                 theme = "secondary";
+
+                // See if a button exists
+                if (this.props.btnProps && this.props.btnProps.type > 0) {
+                    // Match the theme to the button type
+                    switch (this.props.type) {
+                        // Danger
+                        case ButtonTypes.Danger:
+                        case ButtonTypes.OutlineDanger:
+                            theme = "danger";
+                            break;
+                        // Dark
+                        case ButtonTypes.Dark:
+                        case ButtonTypes.OutlineDark:
+                            theme = "dark";
+                            break;
+                        // Info
+                        case ButtonTypes.Info:
+                        case ButtonTypes.OutlineInfo:
+                            theme = "info";
+                            break;
+                        // Light
+                        case ButtonTypes.Light:
+                        case ButtonTypes.OutlineLight:
+                            theme = "light";
+                            break;
+                        // Link
+                        case ButtonTypes.Link:
+                        case ButtonTypes.OutlineLink:
+                            theme = "light-border";
+                            break;
+                        // Primary
+                        case ButtonTypes.Primary:
+                        case ButtonTypes.OutlinePrimary:
+                            theme = "primary";
+                            break;
+                        // Secondary
+                        case ButtonTypes.Secondary:
+                        case ButtonTypes.OutlineSecondary:
+                            theme = "secondary";
+                            break;
+                        // Success
+                        case ButtonTypes.Success:
+                        case ButtonTypes.OutlineSuccess:
+                            theme = "success";
+                            break;
+                        // Warning
+                        case ButtonTypes.Warning:
+                        case ButtonTypes.OutlineWarning:
+                            theme = "warning";
+                            break;
+                    }
+                }
                 break;
         }
 

package/src/components/tooltipGroup/index.ts

@@ -48,6 +48,7 @@ class _TooltipGroup extends Base<ITooltipGroupProps> implements ITooltipGroup {
             let tooltipProps = tooltips[i];
 
             // Set the properties
+            tooltipProps.options = tooltipProps.options || this.props.tooltipOptions;
             tooltipProps.placement = tooltipProps.placement || this.props.tooltipPlacement;
             tooltipProps.type = tooltipProps.type || this.props.tooltipType;
 

package/src/components/tooltipGroup/types.d.ts

@@ -40,6 +40,7 @@
  */
 export const TooltipGroup: (props: ITooltipGroupProps, template?: string, btnTemplate?: string) => ITooltipGroup;
 
+import { ITippyProps } from "../../types";
 import { IBaseProps } from "../types";
 import { ITooltip, ITooltipProps } from "../tooltip/types";
 
@@ -71,6 +72,7 @@ export interface ITooltipGroupProps extends IBaseProps<ITooltipGroup> {
     isSmall?: boolean;
     isVertical?: boolean;
     label?: string;
+    tooltipOptions?: ITippyProps;
     tooltipPlacement?: number;
     tooltipType?: number;
 }