Skip to content

Commit

Permalink
Fix type mismatches (#23)
Browse files Browse the repository at this point in the history
* Added back layoutGrow for Frame and its subclasses.

* Children of frame now converts properly as nodes

* Update frame

* Fixed (hopefully) frame

* Added parameters needed to properly construct a frame in ComponentNode

* Allow null value in fillOverrideTable

* preserveRatio and layoutGrow in frame is now non-null, consistent with vector.

* Fixed name
  • Loading branch information
BigFlexLiu authored Jul 28, 2023
1 parent 2f8ce71 commit 38090f3
Show file tree
Hide file tree
Showing 20 changed files with 856 additions and 308 deletions.
8 changes: 4 additions & 4 deletions lib/src/models/arc_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ part 'arc_data.g.dart';
@CopyWith()
class ArcData {
ArcData({
required this.start,
required this.end,
required this.startingAngle,
required this.endingAngle,
required this.innerRadius,
});

/// Start of the sweep in radians.
final double start;
final double startingAngle;

/// End of the sweep in radians.
final double end;
final double endingAngle;

/// Inner radius value between 0 and 1.
final double innerRadius;
Expand Down
43 changes: 23 additions & 20 deletions lib/src/models/arc_data.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions lib/src/models/boolean_operation.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 36 additions & 10 deletions lib/src/models/component_node.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:figma/src/converters/converters.dart';
import 'package:copy_with_extension/copy_with_extension.dart';
import 'package:figma/src/models.dart';
import 'package:json_annotation/json_annotation.dart';
Expand All @@ -18,14 +19,10 @@ class ComponentNode extends Frame {
required super.exportSettings,
required super.children,
required super.opacity,
required super.primaryAxisAlignItems,
required super.counterAxisAlignItems,
required super.primaryAxisSizingMode,
required super.layoutPositioning,
required super.itemReverseZIndex,
required super.strokesIncludedInLayout,
required super.counterAxisSizingMode,
required super.paddingBottom,
required super.paddingLeft,
required super.paddingRight,
required super.paddingTop,
required super.horizontalPadding,
required super.verticalPadding,
required super.itemSpacing,
Expand All @@ -34,10 +31,39 @@ class ComponentNode extends Frame {
required super.effects,
required super.isMask,
required super.isMaskOutline,
required super.layoutPositioning,
required super.itemReverseZIndex,
required super.strokesIncludedInLayout,
required super.counterAxisAlignItems,
required super.primaryAxisAlignItems,
required super.primaryAxisSizingMode,
required super.paddingBottom,
required super.paddingLeft,
required super.paddingRight,
required super.paddingTop,
required super.size,
required this.componentPropertyDefinitions,
super.styles,
super.componentPropertyReferencesMap,
super.absoluteBoundingBox,
super.absoluteRenderBounds,
super.rotation,
super.name,
super.pluginData,
super.sharedPluginData,
super.type,
super.strokeWeight,
super.strokeAlign,
super.cornerRadius,
super.rectangleCornerRadii,
super.blendMode,
required super.preserveRatio,
required super.layoutGrow,
super.constraints,
super.layoutAlign,
super.transitionNodeID,
super.transitionDuration,
super.relativeTransform,
super.clipsContent,
super.layoutMode,
super.individualStrokeWeights,
});

/// A mapping of name to ComponentPropertyDefinition for every component
Expand Down
Loading

0 comments on commit 38090f3

Please sign in to comment.