Add alignment to menu buttons

LinwoodDev · Oct 26, 2024 · fb0c337 · fb0c337
1 parent dd66f63
commit fb0c337
Showing 1 changed file with 43 additions and 25 deletions.
diff --git a/packages/material_leap/lib/src/widgets/menu.dart b/packages/material_leap/lib/src/widgets/menu.dart
@@ -10,15 +10,23 @@ Widget _offsetCalculator(
   BuildContext context,
   Widget Function(Offset? Function() offset) builder, {
   bool calculateLocalOffset = true,
+  AlignmentGeometry? alignment = Alignment.topRight,
 }) {
   if (!calculateLocalOffset) {
     return builder(() => null);
   }
   return Builder(builder: (currentContext) {
     return builder(() {
       final RenderBox renderBox = context.findRenderObject() as RenderBox;
-      return renderBox.globalToLocal(Offset.zero,
+      final offset = renderBox.globalToLocal(Offset.zero,
           ancestor: currentContext.findRenderObject());
+      if (alignment != null) {
+        final size = renderBox.size;
+        final alignmentOffset = alignment.resolve(Directionality.of(context));
+        return offset + alignmentOffset.alongSize(size);
+      } else {
+        return offset;
+      }
     });
   });
 }
@@ -31,20 +39,23 @@ MenuAnchorChildBuilder defaultMenuButton({
   bool selectedOnOpen = true,
   String? tooltip,
   bool calculateLocalOffset = false,
+  AlignmentGeometry? alignment = Alignment.topRight,
 }) =>
     (context, controller, child) => _offsetCalculator(
-        context,
-        (offset) => IconButton(
-              icon: iconBuilder?.call(context, controller, child) ??
-                  icon ??
-                  const PhosphorIcon(PhosphorIconsLight.dotsThreeVertical),
-              tooltip: tooltip,
-              isSelected:
-                  (selectedOnOpen && controller.isOpen) ? true : isSelected,
-              onPressed:
-                  enabled ? () => controller.toggle(position: offset()) : null,
-            ),
-        calculateLocalOffset: calculateLocalOffset);
+          context,
+          (offset) => IconButton(
+            icon: iconBuilder?.call(context, controller, child) ??
+                icon ??
+                const PhosphorIcon(PhosphorIconsLight.dotsThreeVertical),
+            tooltip: tooltip,
+            isSelected:
+                (selectedOnOpen && controller.isOpen) ? true : isSelected,
+            onPressed:
+                enabled ? () => controller.toggle(position: offset()) : null,
+          ),
+          calculateLocalOffset: calculateLocalOffset,
+          alignment: alignment,
+        );
 
 MenuAnchorChildBuilder defaultFilledMenuButton({
   Widget? icon,
@@ -54,20 +65,23 @@ MenuAnchorChildBuilder defaultFilledMenuButton({
   bool selectedOnOpen = true,
   String? tooltip,
   bool calculateLocalOffset = false,
+  AlignmentGeometry? alignment = Alignment.topRight,
 }) =>
     (context, controller, child) => _offsetCalculator(
-        context,
-        (offset) => IconButton.filled(
-              icon: iconBuilder?.call(context, controller, child) ??
-                  icon ??
-                  const PhosphorIcon(PhosphorIconsLight.dotsThreeVertical),
-              tooltip: tooltip,
-              isSelected:
-                  (selectedOnOpen && controller.isOpen) ? true : isSelected,
-              onPressed:
-                  enabled ? () => controller.toggle(position: offset()) : null,
-            ),
-        calculateLocalOffset: calculateLocalOffset);
+          context,
+          (offset) => IconButton.filled(
+            icon: iconBuilder?.call(context, controller, child) ??
+                icon ??
+                const PhosphorIcon(PhosphorIconsLight.dotsThreeVertical),
+            tooltip: tooltip,
+            isSelected:
+                (selectedOnOpen && controller.isOpen) ? true : isSelected,
+            onPressed:
+                enabled ? () => controller.toggle(position: offset()) : null,
+          ),
+          calculateLocalOffset: calculateLocalOffset,
+          alignment: alignment,
+        );
 
 MenuAnchorChildBuilder defaultFilledTonalMenuButton({
   Widget? icon,
@@ -77,6 +91,7 @@ MenuAnchorChildBuilder defaultFilledTonalMenuButton({
   bool selectedOnOpen = true,
   String? tooltip,
   bool calculateLocalOffset = false,
+  AlignmentGeometry? alignment = Alignment.topRight,
 }) =>
     (context, controller, child) => _offsetCalculator(
           context,
@@ -91,6 +106,7 @@ MenuAnchorChildBuilder defaultFilledTonalMenuButton({
                 enabled ? () => controller.toggle(position: offset()) : null,
           ),
           calculateLocalOffset: calculateLocalOffset,
+          alignment: alignment,
         );
 
 MenuAnchorChildBuilder defaultOutlinedMenuButton({
@@ -101,6 +117,7 @@ MenuAnchorChildBuilder defaultOutlinedMenuButton({
   bool selectedOnOpen = true,
   String? tooltip,
   bool calculateLocalOffset = false,
+  AlignmentGeometry? alignment = Alignment.topRight,
 }) =>
     (context, controller, child) => _offsetCalculator(
           context,
@@ -115,4 +132,5 @@ MenuAnchorChildBuilder defaultOutlinedMenuButton({
                 enabled ? () => controller.toggle(position: offset()) : null,
           ),
           calculateLocalOffset: calculateLocalOffset,
+          alignment: alignment,
         );