@fluid-topics/ft-button 1.3.45 → 1.3.47

package/build/ft-base-button.d.ts

@@ -52,7 +52,7 @@ export declare class FtBaseButton extends FtBaseButton_base implements FtBaseBut
     private setTooltipManual;
     click(): void;
     private getLabel;
-    get textContent(): string;
+    getTextContent(): string;
     protected hasTextContent(): boolean;
     private onSlotchange;
     private isDisabled;

package/build/ft-base-button.js

@@ -7,7 +7,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { FtLitElement, isSafari, toFtFormComponent, unslotText } from "@fluid-topics/ft-wc-utils";
 import { FtRipple } from "@fluid-topics/ft-ripple";
 import { FtTooltip } from "@fluid-topics/ft-tooltip";
-import { FtTypography } from "@fluid-topics/ft-typography";
 import { FtIcon } from "@fluid-topics/ft-icon";
 import { FtLoader } from "@fluid-topics/ft-loader";
 import { html } from "lit";
@@ -56,13 +55,13 @@ class FtBaseButton extends toFtFormComponent(FtLitElement) {
                        ?disabled=${this.isDisabled()}
                        ?activated=${this.activated}
             ></ft-ripple>
-            <ft-typography part="label"
-                           variant="${this.typographyVariant}"
-                           element="span"
-                           class="ft-button--label ${isSafari ? "ft-safari-ellipsis-fix" : ""}"
-                           ?hidden=${!this.hasTextContent()}>
+            <ft-or-ftds-typography part="label"
+                                   variant="${this.typographyVariant}"
+                                   element="span"
+                                   class="ft-button--label ${isSafari ? "ft-safari-ellipsis-fix" : ""}"
+                                   ?hidden=${!this.hasTextContent()}>
                 <slot @slotchange=${this.onSlotchange}></slot>
-            </ft-typography>
+            </ft-or-ftds-typography>
             ${this.resolveIcon()}
         `;
         const href = this.href != null && this.href.trim().length > 0 ? this.href : undefined;
@@ -131,13 +130,13 @@ class FtBaseButton extends toFtFormComponent(FtLitElement) {
         (_a = this.button) === null || _a === void 0 ? void 0 : _a.click();
     }
     getLabel() {
-        return this.label || this.textContent;
+        return this.label || this.getTextContent();
     }
-    get textContent() {
+    getTextContent() {
         return unslotText(this.slottedContent).trim();
     }
     hasTextContent() {
-        return this.textContent.length > 0;
+        return this.getTextContent().length > 0;
     }
     onSlotchange() {
         this.requestUpdate();
@@ -149,7 +148,6 @@ class FtBaseButton extends toFtFormComponent(FtLitElement) {
 FtBaseButton.elementDefinitions = {
     "ft-ripple": FtRipple,
     "ft-tooltip": FtTooltip,
-    "ft-typography": FtTypography,
     "ft-icon": FtIcon,
     "ft-loader": FtLoader,
 };

package/build/ft-button.d.ts

@@ -1,7 +1,9 @@
+import { ElementDefinitionsMap } from "@fluid-topics/ft-wc-utils";
 import { FtButtonProperties } from "./ft-button.properties";
 import { FtBaseButton } from "./ft-base-button";
 import { ClassInfo } from "lit/directives/class-map.js";
 export declare class FtButton extends FtBaseButton implements FtButtonProperties {
+    static elementDefinitions: ElementDefinitionsMap;
     primary: boolean;
     outlined: boolean;
     dense: boolean;

package/build/ft-button.js

@@ -8,6 +8,7 @@ import { property } from "lit/decorators.js";
 import { safariEllipsisFix } from "@fluid-topics/ft-wc-utils";
 import { classicStyles } from "./ft-button.styles";
 import { FtBaseButton } from "./ft-base-button";
+import { FtTypography, FtTypographyVariants } from "@fluid-topics/ft-typography";
 class FtButton extends FtBaseButton {
     constructor() {
         super(...arguments);
@@ -29,9 +30,13 @@ class FtButton extends FtBaseButton {
         };
     }
     get typographyVariant() {
-        return "button";
+        return FtTypographyVariants.button;
     }
 }
+FtButton.elementDefinitions = {
+    ...FtBaseButton.elementDefinitions,
+    "ft-or-ftds-typography": FtTypography,
+};
 FtButton.styles = [
     safariEllipsisFix,
     classicStyles,