flet-datatable2 0.1.0.dev1__py3-none-any.whl → 0.2.0.dev45__py3-none-any.whl

flutter/flet_datatable2/lib/src/datatable2.dart

@@ -1,32 +1,23 @@
-import 'dart:convert';
-
-import 'package:collection/collection.dart';
 import 'package:data_table_2/data_table_2.dart';
 import 'package:flet/flet.dart' as ft;
 import 'package:flet/flet.dart';
 import 'package:flutter/material.dart';
 
+import 'utils/datatable.dart';
+
 class DataTable2Control extends StatefulWidget {
-  final Control? parent;
   final Control control;
-  final List<Control> children;
-  final bool parentDisabled;
-  final FletControlBackend backend;
 
-  const DataTable2Control(
-      {super.key,
-      this.parent,
-      required this.control,
-      required this.children,
-      required this.parentDisabled,
-      required this.backend});
+  const DataTable2Control({
+    super.key,
+    required this.control,
+  });
 
   @override
   State<DataTable2Control> createState() => _DataTable2ControlState();
 }
 
-class _DataTable2ControlState extends State<DataTable2Control>
-    with FletStoreMixin {
+class _DataTable2ControlState extends State<DataTable2Control> {
   //final ScrollController _horizontalController = ScrollController();
   //final ScrollController _controller = ScrollController();
 
@@ -39,271 +30,166 @@ class _DataTable2ControlState extends State<DataTable2Control>
 
   @override
   Widget build(BuildContext context) {
-    debugPrint("DataTableControl build: ${widget.control.id}");
+    debugPrint("DataTable2Control build: ${widget.control.id}");
 
-    bool tableDisabled = widget.control.isDisabled || widget.parentDisabled;
+    var bgColor = widget.control.getString("bgcolor");
+    var border = widget.control.getBorder("border", Theme.of(context));
+    var borderRadius = widget.control.getBorderRadius("border_radius");
+    var gradient = widget.control.getGradient("gradient", Theme.of(context));
+    var horizontalLines =
+        widget.control.getBorderSide("horizontal_lines", Theme.of(context));
+    var verticalLines =
+        widget.control.getBorderSide("vertical_lines", Theme.of(context));
+    var defaultDecoration =
+        Theme.of(context).dataTableTheme.decoration ?? const BoxDecoration();
 
-    ColumnSize? parseSize(String? size, [ColumnSize? defValue]) {
-      if (size == null) {
-        return defValue;
-      }
-      return ColumnSize.values.firstWhereOrNull(
-              (e) => e.name.toLowerCase() == size.toLowerCase()) ??
-          defValue;
+    BoxDecoration? decoration;
+    if (bgColor != null ||
+        border != null ||
+        borderRadius != null ||
+        gradient != null) {
+      decoration = (defaultDecoration as BoxDecoration).copyWith(
+          color: parseColor(bgColor, Theme.of(context)),
+          border: border,
+          borderRadius: borderRadius,
+          gradient: gradient);
     }
 
-    var datatable =
-        withControls(widget.children.where((c) => c.isVisible).map((c) => c.id),
-            (content, viewModel) {
-      var emptyCtrls =
-          widget.children.where((c) => c.name == "empty" && c.isVisible);
-      Widget? empty = emptyCtrls.isNotEmpty
-          ? createControl(
-              widget.control, emptyCtrls.first.id, widget.control.isDisabled)
-          : null;
-      IconData? sortArrowIcon =
-          parseIcon(widget.control.attrString("sortArrowIcon"));
-      var bgColor = widget.control.attrString("bgColor");
-      var border = parseBorder(Theme.of(context), widget.control, "border");
-      var borderRadius = parseBorderRadius(widget.control, "borderRadius");
-      var gradient =
-          parseGradient(Theme.of(context), widget.control, "gradient");
-      var horizontalLines =
-          parseBorderSide(Theme.of(context), widget.control, "horizontalLines");
-      var verticalLines =
-          parseBorderSide(Theme.of(context), widget.control, "verticalLines");
-      var defaultDecoration =
-          Theme.of(context).dataTableTheme.decoration ?? const BoxDecoration();
-      var checkboxAlignment = parseAlignment(
-          widget.control, "checkboxAlignment", Alignment.center)!;
-
-      BoxDecoration? decoration;
-      if (bgColor != null ||
-          border != null ||
-          borderRadius != null ||
-          gradient != null) {
-        decoration = (defaultDecoration as BoxDecoration).copyWith(
-            color: parseColor(Theme.of(context), bgColor),
-            border: border,
-            borderRadius: borderRadius,
-            gradient: gradient);
-      }
-
-      TableBorder? tableBorder;
-      if (horizontalLines != null || verticalLines != null) {
-        tableBorder = TableBorder(
-            horizontalInside: horizontalLines ?? BorderSide.none,
-            verticalInside: verticalLines ?? BorderSide.none);
-      }
-
-      Clip clipBehavior =
-          parseClip(widget.control.attrString("clipBehavior"), Clip.none)!;
-
-      return withPageArgs((context, pageArgs) {
-        return DataTable2(
-            bottomMargin: widget.control.attrDouble("bottomMargin"),
-            minWidth: widget.control.attrDouble("minWidth"),
-            //horizontalScrollController: _horizontalController,
-            //scrollController: _controller,
-            decoration: decoration,
-            border: tableBorder,
-            empty: empty,
-            isHorizontalScrollBarVisible:
-                widget.control.attrBool("isHorizontalScrollBarVisible"),
-            isVerticalScrollBarVisible:
-                widget.control.attrBool("isVerticalScrollBarVisible"),
-            fixedLeftColumns: widget.control.attrInt("fixedLeftColumns") ?? 0,
-            fixedTopRows: widget.control.attrInt("fixedTopRows") ?? 1,
-            fixedColumnsColor:
-                widget.control.attrColor("fixedColumnsColor", context),
-            fixedCornerColor:
-                widget.control.attrColor("fixedCornerColor", context),
-            smRatio: widget.control.attrDouble("smRatio") ?? 0.67,
-            lmRatio: widget.control.attrDouble("lmRatio") ?? 1.2,
-            clipBehavior: clipBehavior,
-            sortArrowIcon: sortArrowIcon ?? Icons.arrow_upward,
-            sortArrowAnimationDuration:
-                parseDuration(widget.control, "sortArrowAnimationDuration") ??
-                    Duration(microseconds: 150),
-            checkboxHorizontalMargin:
-                widget.control.attrDouble("checkboxHorizontalMargin"),
-            checkboxAlignment: checkboxAlignment,
-            headingCheckboxTheme: parseCheckboxTheme(
-                Theme.of(context),
-                widget.control.attrString("headingCheckboxTheme") != null
-                    ? json.decode(
-                        widget.control.attrString("headingCheckboxTheme")!)
-                    : null),
-            datarowCheckboxTheme: parseCheckboxTheme(
-                Theme.of(context),
-                widget.control.attrString("dataRowCheckboxTheme") != null
-                    ? json.decode(
-                        widget.control.attrString("dataRowCheckboxTheme")!)
-                    : null),
-            showHeadingCheckBox:
-                widget.control.attrBool("showHeadingCheckbox", true)!,
-            columnSpacing: widget.control.attrDouble("columnSpacing"),
-            dataRowColor: parseWidgetStateColor(
-                Theme.of(context), widget.control, "dataRowColor"),
-            dataRowHeight: widget.control.attrDouble("dataRowHeight"),
-            //dataRowMinHeight: widget.control.attrDouble("dataRowMinHeight"),
-            //dataRowMaxHeight: widget.control.attrDouble("dataRowMaxHeight"),
-            dataTextStyle: parseTextStyle(
-                Theme.of(context), widget.control, "dataTextStyle"),
-            headingRowColor: parseWidgetStateColor(
-                Theme.of(context), widget.control, "headingRowColor"),
-            headingRowHeight: widget.control.attrDouble("headingRowHeight"),
-            headingTextStyle: parseTextStyle(
-                Theme.of(context), widget.control, "headingTextStyle"),
-            headingRowDecoration: parseBoxDecoration(Theme.of(context),
-                widget.control, "headingRowDecoration", pageArgs),
-            dividerThickness: widget.control.attrDouble("dividerThickness"),
-            horizontalMargin: widget.control.attrDouble("horizontalMargin"),
-            showBottomBorder:
-                widget.control.attrBool("showBottomBorder", false)!,
-            showCheckboxColumn:
-                widget.control.attrBool("showCheckboxColumn", false)!,
-            sortAscending: widget.control.attrBool("sortAscending", false)!,
-            sortColumnIndex: widget.control.attrInt("sortColumnIndex"),
-            onSelectAll: widget.control.attrBool("onSelectAll", false)!
-                ? (selected) {
-                    widget.backend.triggerControlEvent(
-                        widget.control.id,
-                        "select_all",
-                        selected != null ? selected.toString() : "");
-                  }
+    var datatable2 = DataTable2(
+      // scrollController: _controller,
+      // horizontalScrollController: _horizontalController,
+      decoration: decoration,
+      border: (horizontalLines != null || verticalLines != null)
+          ? TableBorder(
+              horizontalInside: horizontalLines ?? BorderSide.none,
+              verticalInside: verticalLines ?? BorderSide.none)
+          : null,
+      clipBehavior: widget.control.getClipBehavior("clip_behavior", Clip.none)!,
+      checkboxHorizontalMargin:
+          widget.control.getDouble("checkbox_horizontal_margin"),
+      columnSpacing: widget.control.getDouble("column_spacing"),
+      minWidth: widget.control.getDouble("min_width"),
+      bottomMargin: widget.control.getDouble("bottom_margin"),
+      empty: widget.control.buildWidget("empty"),
+      isHorizontalScrollBarVisible:
+          widget.control.getBool("visible_horizontal_scroll_bar"),
+      isVerticalScrollBarVisible:
+          widget.control.getBool("visible_vertical_scroll_bar"),
+      fixedLeftColumns: widget.control.getInt("fixed_left_columns", 0)!,
+      fixedTopRows: widget.control.getInt("fixed_top_rows", 1)!,
+      fixedColumnsColor:
+          widget.control.getColor("fixed_columns_color", context),
+      fixedCornerColor: widget.control.getColor("fixed_corner_color", context),
+      smRatio: widget.control.getDouble("sm_ratio", 0.67)!,
+      lmRatio: widget.control.getDouble("lm_ratio", 1.2)!,
+      sortArrowIcon:
+          widget.control.getIcon("sort_arrow_icon") ?? Icons.arrow_upward,
+      sortArrowAnimationDuration: widget.control.getDuration(
+          "sort_arrow_animation_duration", Duration(microseconds: 150))!,
+      checkboxAlignment:
+          widget.control.getAlignment("checkboxAlignment", Alignment.center)!,
+      headingCheckboxTheme: widget.control
+          .getCheckboxTheme("heading_checkbox_theme", Theme.of(context)),
+      datarowCheckboxTheme: widget.control
+          .getCheckboxTheme("data_row_checkbox_theme", Theme.of(context)),
+      showHeadingCheckBox:
+          widget.control.getBool("show_heading_checkbox", true)!,
+      dataRowColor: widget.control
+          .getWidgetStateColor("data_row_color", Theme.of(context)),
+      dataRowHeight: widget.control.getDouble("data_row_height"),
+      sortArrowIconColor:
+          widget.control.getColor("sort_arrow_icon_color", context),
+      dataTextStyle:
+          widget.control.getTextStyle("data_text_style", Theme.of(context)),
+      headingRowColor: widget.control
+          .getWidgetStateColor("heading_row_color", Theme.of(context)),
+      headingRowHeight: widget.control.getDouble("heading_row_height"),
+      headingTextStyle:
+          widget.control.getTextStyle("heading_text_style", Theme.of(context)),
+      headingRowDecoration:
+          widget.control.getBoxDecoration("heading_row_decoration", context),
+      dividerThickness: widget.control.getDouble("divider_thickness"),
+      horizontalMargin: widget.control.getDouble("horizontal_margin"),
+      showBottomBorder: widget.control.getBool("show_bottom_border", false)!,
+      showCheckboxColumn:
+          widget.control.getBool("show_checkbox_column", false)!,
+      sortAscending: widget.control.getBool("sort_ascending", false)!,
+      sortColumnIndex: widget.control.getInt("sort_column_index"),
+      onSelectAll: widget.control.getBool("on_select_all", false)!
+          ? (bool? selected) =>
+              widget.control.triggerEvent("select_all", selected)
+          : null,
+      columns: widget.control.children("columns").map((column) {
+        column.notifyParent = true;
+        var tooltip =
+            parseTooltip(column.get("tooltip"), context, const Placeholder());
+        return DataColumn2(
+            size: parseColumnSize(column.getString("size"), ColumnSize.S)!,
+            fixedWidth: column.getDouble("fixed_width"),
+            numeric: column.getBool("numeric", false)!,
+            tooltip: tooltip?.message,
+            headingRowAlignment:
+                column.getMainAxisAlignment("heading_row_alignment"),
+            onSort: column.getBool("on_sort", false)!
+                ? (columnIndex, ascending) => column
+                    .triggerEvent("sort", {"ci": columnIndex, "asc": ascending})
                 : null,
-            columns: viewModel.controlViews
-                .where((c) =>
-                    c.control.type == "datacolumn2" && c.control.isVisible)
-                .map((column) {
-              var labelCtrls = column.children
-                  .where((c) => c.name == "label" && c.isVisible);
-              return DataColumn2(
-                  //size: ColumnSize.S,
-                  size: parseSize(
-                      column.control.attrString("size"), ColumnSize.S)!,
-                  fixedWidth: column.control.attrDouble("fixedWidth"),
-                  numeric: column.control.attrBool("numeric", false)!,
-                  tooltip: column.control.attrString("tooltip"),
-                  headingRowAlignment: parseMainAxisAlignment(
-                      column.control.attrString("headingRowAlignment")),
-                  //mouseCursor: WidgetStateMouseCursor.clickable,
-                  onSort: column.control.attrBool("onSort", false)!
-                      ? (columnIndex, ascending) {
-                          widget.backend.triggerControlEvent(
-                              column.control.id,
-                              "sort",
-                              json.encode({"i": columnIndex, "a": ascending}));
-                        }
-                      : null,
-                  label: ft.createControl(column.control, labelCtrls.first.id,
-                      column.control.isDisabled || tableDisabled));
-            }).toList(),
-            rows: viewModel.controlViews
-                .where((c) => c.control.type == "datarow2" && c.control.isVisible)
-                .map((row) {
-              return DataRow2(
-                  key: ValueKey(row.control.id),
-                  selected: row.control.attrBool("selected", false)!,
-                  color: parseWidgetStateColor(
-                      Theme.of(context), row.control, "color"),
-                  specificRowHeight:
-                      row.control.attrDouble("specificRowHeight"),
-                  decoration: parseBoxDecoration(
-                      Theme.of(context), row.control, "decoration", pageArgs),
-                  onSelectChanged:
-                      row.control.attrBool("onSelectChanged", false)!
-                          ? (selected) {
-                              widget.backend.triggerControlEvent(
-                                  row.control.id,
-                                  "select_changed",
-                                  selected != null ? selected.toString() : "");
-                            }
-                          : null,
-                  onLongPress: row.control.attrBool("onLongPress", false)!
-                      ? () {
-                          widget.backend.triggerControlEvent(
-                              row.control.id, "long_press");
-                        }
-                      : null,
-                  onDoubleTap: row.control.attrBool("onDoubleTap", false)!
-                      ? () {
-                          widget.backend.triggerControlEvent(
-                              row.control.id, "double_tap");
-                        }
-                      : null,
-                  onTap: row.control.attrBool("onTap", false)!
-                      ? () {
-                          widget.backend
-                              .triggerControlEvent(row.control.id, "tap");
-                        }
-                      : null,
-                  onSecondaryTap: row.control.attrBool("onSecondaryTap", false)!
-                      ? () {
-                          widget.backend.triggerControlEvent(
-                              row.control.id, "secondary_tap");
-                        }
-                      : null,
-                  onSecondaryTapDown:
-                      row.control.attrBool("onSecondaryTapDown", false)!
-                          ? (details) {
-                              widget.backend.triggerControlEvent(
-                                  row.control.id, "secondary_tap_down");
-                            }
-                          : null,
-                  cells: row.children
-                      .where((c) => c.type == "datacell" && c.isVisible)
-                      .map((cell) => DataCell(
-                            ft.createControl(row.control, cell.childIds.first,
-                                row.control.isDisabled || tableDisabled),
-                            placeholder: cell.attrBool("placeholder", false)!,
-                            showEditIcon: cell.attrBool("showEditIcon", false)!,
-                            onDoubleTap: cell.attrBool("onDoubleTap", false)!
-                                ? () {
-                                    widget.backend.triggerControlEvent(
-                                        cell.id, "double_tap");
-                                  }
-                                : null,
-                            onLongPress: cell.attrBool("onLongPress", false)!
-                                ? () {
-                                    widget.backend.triggerControlEvent(
-                                        cell.id, "long_press");
-                                  }
-                                : null,
-                            onTap: cell.attrBool("onTap", false)!
-                                ? () {
-                                    widget.backend
-                                        .triggerControlEvent(cell.id, "tap");
-                                  }
-                                : null,
-                            onTapCancel: cell.attrBool("onTapCancel", false)!
-                                ? () {
-                                    widget.backend.triggerControlEvent(
-                                        cell.id, "tap_cancel");
-                                  }
-                                : null,
-                            onTapDown: cell.attrBool("onTapDown", false)!
-                                ? (details) {
-                                    widget.backend.triggerControlEvent(
-                                        cell.id,
-                                        "tap_down",
-                                        json.encode({
-                                          "kind": details.kind?.name,
-                                          "lx": details.localPosition.dx,
-                                          "ly": details.localPosition.dy,
-                                          "gx": details.globalPosition.dx,
-                                          "gy": details.globalPosition.dy,
-                                        }));
-                                  }
-                                : null,
-                          ))
-                      .toList());
-            }).toList());
-      });
-    });
+            label: column.buildTextOrWidget("label")!);
+      }).toList(),
+      rows: widget.control.children("rows").map((row) {
+        row.notifyParent = true;
+        return DataRow2(
+          key: ValueKey(row.id),
+          selected: row.getBool("selected", false)!,
+          color: row.getWidgetStateColor("color", Theme.of(context)),
+          specificRowHeight: row.getDouble("specific_row_height"),
+          decoration: row.getBoxDecoration("decoration", context),
+          onSelectChanged: row.getBool("on_select_change", false)!
+              ? (selected) => row.triggerEvent("select_change", selected)
+              : null,
+          onLongPress: row.getBool("on_long_press", false)!
+              ? () => row.triggerEvent("long_press")
+              : null,
+          onDoubleTap: row.getBool("on_double_tap", false)!
+              ? () => row.triggerEvent("double_tap")
+              : null,
+          onTap: row.getBool("on_tap", false)!
+              ? () => row.triggerEvent("tap")
+              : null,
+          onSecondaryTap: row.getBool("on_secondary_tap", false)!
+              ? () => row.triggerEvent("secondary_tap")
+              : null,
+          onSecondaryTapDown: row.getBool("on_secondary_tap_down", false)!
+              ? (details) =>
+                  row.triggerEvent("secondary_tap_down", details.toMap())
+              : null,
+          cells: row.children("cells").map((cell) {
+            cell.notifyParent = true;
+            return DataCell(
+              cell.buildWidget("content")!,
+              placeholder: cell.getBool("placeholder", false)!,
+              showEditIcon: cell.getBool("show_edit_icon", false)!,
+              onDoubleTap: cell.getBool("on_double_tap", false)!
+                  ? () => cell.triggerEvent("double_tap")
+                  : null,
+              onLongPress: cell.getBool("on_long_press", false)!
+                  ? () => cell.triggerEvent("long_press")
+                  : null,
+              onTap: cell.getBool("on_tap", false)!
+                  ? () => cell.triggerEvent("tap")
+                  : null,
+              onTapCancel: cell.getBool("on_tap_cancel", false)!
+                  ? () => cell.triggerEvent("tap_cancel")
+                  : null,
+              onTapDown: cell.getBool("on_tap_down", false)!
+                  ? (details) => cell.triggerEvent("tap_down", details.toMap())
+                  : null,
+            );
+          }).toList(),
+        );
+      }).toList(),
+    );
 
-    return constrainedControl(
-        context, datatable, widget.parent, widget.control);
+    return ConstrainedControl(control: widget.control, child: datatable2);
   }
 }

flutter/flet_datatable2/lib/src/extension.dart

@@ -0,0 +1,16 @@
+import 'package:flet/flet.dart';
+import 'package:flutter/widgets.dart';
+
+import 'datatable2.dart';
+
+class Extension extends FletExtension {
+  @override
+  Widget? createWidget(Key? key, Control control) {
+    switch (control.type) {
+      case "DataTable2":
+        return DataTable2Control(key: key, control: control);
+      default:
+        return null;
+    }
+  }
+}

flutter/flet_datatable2/lib/src/utils/datatable.dart

@@ -0,0 +1,11 @@
+import 'package:collection/collection.dart';
+import 'package:data_table_2/data_table_2.dart';
+
+ColumnSize? parseColumnSize(String? size, [ColumnSize? defValue]) {
+  if (size == null) {
+    return defValue;
+  }
+  return ColumnSize.values.firstWhereOrNull(
+          (e) => e.name.toLowerCase() == size.toLowerCase()) ??
+      defValue;
+}