@effindomv2/fui-as 0.1.37 → 0.1.39

package/src/controls/index.ts

@@ -6,8 +6,9 @@ export { LabeledControlColors } from "./LabeledControlColors";
 export { TextInputColors } from "./TextInputColors";
 export { DropdownColors } from "./DropdownColors";
 export { SliderColors } from "./SliderColors";
+export { ComboBox, ComboBoxCommitMode, ComboBoxFilterMode, ComboBoxItem } from "./ComboBox";
 export { ContextMenu, MenuItem } from "./ContextMenu";
-export { Dialog } from "./Dialog";
+export { Dialog, DialogShownEventArgs } from "./Dialog";
 export { Dropdown, DropdownItem } from "./Dropdown";
 export { Form } from "./Form";
 export { NavLink } from "./NavLink";

package/src/controls/internal/ButtonPresenter.ts

@@ -1,6 +1,5 @@
 import {
   AlignItems,
-  BorderStyle,
   FlexDirection,
   JustifyContent,
 } from "../../core/ffi";
@@ -70,7 +69,7 @@ class DefaultButtonPresenter extends ButtonPresenter {
       .justifyContent(JustifyContent.Center)
       .alignItems(AlignItems.Center)
       .cornerRadius(theme.spacing.sm)
-      .border(1.0, theme.colors.border, BorderStyle.Solid)
+      .border(1.0, theme.colors.border)
       .padding(theme.spacing.md, theme.spacing.sm, theme.spacing.md, theme.spacing.sm)
       .dropShadow(0x00000000, 0.0, 0.0, 0.0, 0.0)
       .bgColor(background);
@@ -94,3 +93,7 @@ class DefaultButtonTemplate extends ButtonTemplate {
 }
 
 export const defaultButtonTemplate = new DefaultButtonTemplate();
+
+export function createDefaultButtonPresenter(): ButtonPresenter {
+  return new DefaultButtonPresenter();
+}

package/src/controls/internal/CheckboxIndicatorPresenter.ts

@@ -1,4 +1,4 @@
-import { BorderStyle, SemanticCheckedState, Unit } from "../../core/ffi";
+import { AlignItems, JustifyContent, SemanticCheckedState, Unit } from "../../core/ffi";
 import { Theme } from "../../core/Theme";
 import { FlexBox, Svg } from "../../nodes";
 import { LabeledControlSizing } from "../ControlSizing";
@@ -9,7 +9,7 @@ import {
   PressableIndicatorVisualState,
 } from "./PressableIndicatorPresenter";
 
-const CHECKBOX_CHECK_SVG_URL = "data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 14 14'><path d='M3.25 8.25 6.35 11.35 12.75 4.95' fill='none' stroke='%23000000' stroke-width='2.4' stroke-linecap='round' stroke-linejoin='round'/></svg>";
+const CHECKBOX_CHECK_SVG_URL = "data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 14 14'><path d='M2.25 7.15 5.35 10.25 11.75 3.85' fill='none' stroke='%23000000' stroke-width='2.4' stroke-linecap='round' stroke-linejoin='round'/></svg>";
 
 class CheckboxIndicatorMetrics extends PressableIndicatorMetrics {
   constructor(
@@ -56,7 +56,7 @@ export abstract class CheckboxIndicatorPresenter extends PressableIndicatorPrese
 }
 
 export abstract class CheckboxIndicatorTemplate {
-  abstract create(): CheckboxIndicatorPresenter;
+  abstract create(sizing?: LabeledControlSizing | null): CheckboxIndicatorPresenter;
 }
 
 class DefaultCheckboxIndicatorPresenter extends CheckboxIndicatorPresenter {
@@ -67,14 +67,14 @@ class DefaultCheckboxIndicatorPresenter extends CheckboxIndicatorPresenter {
     const root = new FlexBox()
       .width(metrics.indicatorSize, Unit.Pixel)
       .height(metrics.indicatorSize, Unit.Pixel)
-      .alignItems(1)
-      .justifyContent(1);
+      .alignItems(AlignItems.Center)
+      .justifyContent(JustifyContent.Center);
     super(root, metrics);
     this.geometry = metrics;
     const markHost = new FlexBox()
       .fillSize()
-      .alignItems(1)
-      .justifyContent(1);
+      .alignItems(AlignItems.Center)
+      .justifyContent(JustifyContent.Center);
     const markNode = new Svg();
     markNode
       .width(metrics.checkMarkSize, Unit.Pixel)
@@ -102,7 +102,7 @@ class DefaultCheckboxIndicatorPresenter extends CheckboxIndicatorPresenter {
       background = theme.colors.background;
     }
     this.root.cornerRadius(geometry.cornerRadius);
-    this.root.border(1.0, borderColor, BorderStyle.Solid);
+    this.root.border(1.0, borderColor);
     this.root.bgColor(background);
     if (markVisible) {
       this.markNode.source(CHECKBOX_CHECK_SVG_URL);
@@ -119,8 +119,8 @@ class DefaultCheckboxIndicatorPresenter extends CheckboxIndicatorPresenter {
 }
 
 class DefaultCheckboxIndicatorTemplate extends CheckboxIndicatorTemplate {
-  create(): CheckboxIndicatorPresenter {
-    return new DefaultCheckboxIndicatorPresenter();
+  create(sizing: LabeledControlSizing | null = null): CheckboxIndicatorPresenter {
+    return createDefaultCheckboxIndicatorPresenter(sizing);
   }
 }
 

package/src/controls/internal/DropdownChevronPresenter.ts

@@ -43,7 +43,7 @@ export abstract class DropdownChevronPresenter {
 }
 
 export abstract class DropdownChevronTemplate {
-  abstract create(): DropdownChevronPresenter;
+  abstract create(sizing?: DropdownSizing | null): DropdownChevronPresenter;
 }
 
 class DefaultDropdownChevronPresenter extends DropdownChevronPresenter {
@@ -80,8 +80,8 @@ class DefaultDropdownChevronPresenter extends DropdownChevronPresenter {
 }
 
 class DefaultDropdownChevronTemplate extends DropdownChevronTemplate {
-  create(): DropdownChevronPresenter {
-    return new DefaultDropdownChevronPresenter();
+  create(sizing: DropdownSizing | null = null): DropdownChevronPresenter {
+    return createDefaultDropdownChevronPresenter(sizing);
   }
 }
 

package/src/controls/internal/DropdownFieldPresenter.ts

@@ -1,6 +1,5 @@
 import {
   AlignItems,
-  BorderStyle,
   FlexDirection,
   JustifyContent,
   TextVerticalAlign,
@@ -103,7 +102,7 @@ export abstract class DropdownFieldPresenter {
 }
 
 export abstract class DropdownFieldTemplate {
-  abstract create(): DropdownFieldPresenter;
+  abstract create(sizing?: DropdownSizing | null): DropdownFieldPresenter;
 }
 
 class DefaultDropdownFieldPresenter extends DropdownFieldPresenter {
@@ -145,7 +144,7 @@ class DefaultDropdownFieldPresenter extends DropdownFieldPresenter {
       .alignItems(AlignItems.Center)
       .height(metrics.height, Unit.Pixel)
       .cornerRadius(theme.spacing.sm)
-      .border(2.0, borderColor, BorderStyle.Solid)
+      .border(2.0, borderColor)
       .padding(metrics.paddingLeft, metrics.paddingTop, metrics.paddingRight, metrics.paddingBottom)
       .bgColor(bg);
     this.valueHost
@@ -154,7 +153,8 @@ class DefaultDropdownFieldPresenter extends DropdownFieldPresenter {
       ? theme.colors.textMuted
       : (colors !== null && colors.hasTextPrimary ? colors.textPrimaryColor : theme.colors.textPrimary);
     this.valueNode
-      .font(theme.fonts.body, metrics.fontSize)
+      .fontFamily(theme.fonts.bodyFamily)
+      .fontSize(metrics.fontSize)
       .lineHeight(contentHeight)
       .textColor(textColor);
     this.chevronHost
@@ -166,8 +166,8 @@ class DefaultDropdownFieldPresenter extends DropdownFieldPresenter {
 }
 
 class DefaultDropdownFieldTemplate extends DropdownFieldTemplate {
-  create(): DropdownFieldPresenter {
-    return new DefaultDropdownFieldPresenter();
+  create(sizing: DropdownSizing | null = null): DropdownFieldPresenter {
+    return createDefaultDropdownFieldPresenter(sizing);
   }
 }
 

package/src/controls/internal/DropdownOptionRowPresenter.ts

@@ -60,7 +60,7 @@ export abstract class DropdownOptionRowPresenter {
 }
 
 export abstract class DropdownOptionRowTemplate {
-  abstract create(): DropdownOptionRowPresenter;
+  abstract create(sizing?: DropdownSizing | null): DropdownOptionRowPresenter;
 }
 
 class DefaultDropdownOptionRowPresenter extends DropdownOptionRowPresenter {
@@ -92,14 +92,15 @@ class DefaultDropdownOptionRowPresenter extends DropdownOptionRowPresenter {
          ? (colors !== null && colors.hasAccent ? colors.accentColor : theme.colors.accent)
          : (colors !== null && colors.hasTextPrimary ? colors.textPrimaryColor : theme.colors.textPrimary));
     this.labelNode
-      .font(theme.fonts.body, metrics.fontSize)
+      .fontFamily(theme.fonts.bodyFamily)
+      .fontSize(metrics.fontSize)
       .textColor(labelColor);
   }
 }
 
 class DefaultDropdownOptionRowTemplate extends DropdownOptionRowTemplate {
-  create(): DropdownOptionRowPresenter {
-    return new DefaultDropdownOptionRowPresenter();
+  create(sizing: DropdownSizing | null = null): DropdownOptionRowPresenter {
+    return createDefaultDropdownOptionRowPresenter(sizing);
   }
 }
 

package/src/controls/internal/PressableLabeledControl.ts

@@ -6,7 +6,6 @@ import { keyboardFocusVisible } from "../../core/FocusVisibility";
 import { Node } from "../../core/Node";
 import {
   AlignItems,
-  BorderStyle,
   CursorStyle,
   FlexDirection,
   KeyEventType,
@@ -191,16 +190,14 @@ export class PressableLabeledControl extends FlexBox {
     this.cornerRadius(theme.spacing.sm);
     this.border(
       2.0,
-      TRANSPARENT,
-      BorderStyle.Solid,
+      TRANSPARENT
     );
     this.padding(theme.spacing.xs, theme.spacing.xs, theme.spacing.xs, theme.spacing.xs);
     this.opacity(this.isEnabled ? 1.0 : 0.6);
     this.gapNode.width(theme.spacing.sm, Unit.Pixel);
-    this.labelNode.font(
-      theme.fonts.body,
-      this.labelFontSizeOverride > 0.0 ? this.labelFontSizeOverride : theme.fonts.sizeBody,
-    );
+    this.labelNode
+      .fontFamily(theme.fonts.bodyFamily)
+      .fontSize(this.labelFontSizeOverride > 0.0 ? this.labelFontSizeOverride : theme.fonts.sizeBody);
     const colors = this.colorsValue;
     let labelColor: u32;
     if (this.isEnabled) {

package/src/controls/internal/RadioIndicatorPresenter.ts

@@ -1,4 +1,4 @@
-import { BorderStyle, Unit } from "../../core/ffi";
+import { AlignItems, JustifyContent, Unit } from "../../core/ffi";
 import { Theme } from "../../core/Theme";
 import { FlexBox } from "../../nodes";
 import { LabeledControlSizing } from "../ControlSizing";
@@ -30,7 +30,7 @@ export abstract class RadioIndicatorPresenter extends PressableIndicatorPresente
 }
 
 export abstract class RadioIndicatorTemplate {
-  abstract create(): RadioIndicatorPresenter;
+  abstract create(sizing?: LabeledControlSizing | null): RadioIndicatorPresenter;
 }
 
 class RadioIndicatorMetrics extends PressableIndicatorMetrics {
@@ -76,8 +76,8 @@ class DefaultRadioIndicatorPresenter extends RadioIndicatorPresenter {
     const root = new FlexBox()
       .width(metrics.indicatorSize, Unit.Pixel)
       .height(metrics.indicatorSize, Unit.Pixel)
-      .alignItems(1)
-      .justifyContent(1);
+      .alignItems(AlignItems.Center)
+      .justifyContent(JustifyContent.Center);
     super(root, metrics);
     this.geometry = metrics;
     const dotNode = new FlexBox()
@@ -98,7 +98,7 @@ class DefaultRadioIndicatorPresenter extends RadioIndicatorPresenter {
       ? accent
       : (colors !== null && colors.hasBorder ? colors.borderColor : theme.colors.border);
     this.root.cornerRadius(geometry.indicatorSize * 0.5);
-    this.root.border(geometry.borderWidth, outerColor, BorderStyle.Solid);
+    this.root.border(geometry.borderWidth, outerColor);
     this.root.bgColor(colors !== null && colors.hasBackground ? colors.backgroundColor : theme.colors.surface);
     this.dotNode
       .cornerRadius(geometry.dotSize * 0.5)
@@ -111,8 +111,8 @@ class DefaultRadioIndicatorPresenter extends RadioIndicatorPresenter {
 }
 
 class DefaultRadioIndicatorTemplate extends RadioIndicatorTemplate {
-  create(): RadioIndicatorPresenter {
-    return new DefaultRadioIndicatorPresenter();
+  create(sizing: LabeledControlSizing | null = null): RadioIndicatorPresenter {
+    return createDefaultRadioIndicatorPresenter(sizing);
   }
 }