fix(padding): remove global group parameters

ph1p · Jul 29, 2022 · 563421c · 563421c
1 parent 91e3365
commit 563421c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/components/QuestionMark.tsx b/src/components/QuestionMark.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react';
+import React, { FunctionComponent, PropsWithChildren } from 'react';
 import styled from 'styled-components';
 
 import Tooltip from './Tooltip';
@@ -7,7 +7,9 @@ interface Props {
   hover?: boolean;
 }
 
-export const QuestionMark: FunctionComponent<Props> = (props) => (
+export const QuestionMark: FunctionComponent<PropsWithChildren<Props>> = (
+  props
+) => (
   <Tooltip
     hover={props.hover}
     handler={React.forwardRef<HTMLDivElement, unknown>((_, ref) => (

diff --git a/src/main/padding.ts b/src/main/padding.ts
@@ -51,6 +51,7 @@ export const getPadding = (node: SceneNode) => {
 
 EventEmitter.on('remove padding', async ({ direction }) => {
   const state = await getState();
+
   if (figma.currentPage.selection.length === 1) {
     const currentNode = figma.currentPage.selection[0];
 
@@ -82,7 +83,7 @@ EventEmitter.on('add padding', async ({ direction, settings }) => {
 
   const { lockDetachedGroup, lockAttachedGroup, ...nodeSettings } = settings;
 
-  const nodeData = getNodeAndParentNode(currentNode, state.isGlobalGroup);
+  const nodeData = getNodeAndParentNode(currentNode, undefined);
 
   switch (nodeData.error) {
     case ParentNodeErrors.PARENT_NOT_FOUND:
@@ -171,12 +172,14 @@ EventEmitter.on('add padding', async ({ direction, settings }) => {
         nodes: paddingLines,
         name: GROUP_NAME_DETACHED,
         locked: lockDetachedGroup,
+        isGlobalGroup: state.isGlobalGroup,
       });
     } else {
       appendElementsToGroup({
         node: currentNode,
         nodes: paddingLines,
         locked: lockAttachedGroup,
+        isGlobalGroup: state.isGlobalGroup,
       });
     }
 
@@ -217,15 +220,17 @@ export enum ParentNodeErrors {
 
 export const getNodeAndParentNode = (
   node?: SceneNode,
-  parentNode?: SceneNode,
-  isGlobalGroup?: boolean
+  parentNode?: SceneNode
 ): { node?: SceneNode; parentNode?: SceneNode; error: ParentNodeErrors } => {
   let currentNode = node ?? (figma.currentPage.selection[0] as SceneNode);
 
+  if (parentNode && (parentNode as any).type === 'PAGE') {
+    return { error: ParentNodeErrors.PARENT_NOT_FOUND };
+  }
+
   if (figma.currentPage.selection.length === 1 && !parentNode) {
     if (currentNode.parent && currentNode.parent.type !== 'PAGE') {
-      parentNode = getNearestParentNode(currentNode, isGlobalGroup);
-      console.log(parentNode);
+      parentNode = getNearestParentNode(currentNode);
     } else {
       return { error: ParentNodeErrors.PARENT_NOT_FOUND };
     }

diff --git a/src/views/Settings/index.tsx b/src/views/Settings/index.tsx
@@ -99,7 +99,7 @@ const Settings: FunctionComponent = observer(() => {
           <Toggle
             checked={store.isGlobalGroup}
             label="Use a global group"
-            description="Groups all measurements in one global group"
+            description="All measurements in one group per page"
             onChange={() => store.toggleIsGlobalGroup()}
           />
           <Toggle