Merge branch 'main' of https://github.com/Protofy-xyz/Protofy

Protofy-xyz · Jul 5, 2024 · 3c42258 · 3c42258
2 parents 4b64518 + a4695f8
commit 3c42258
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/packages/protoflow/src/fields/ColorFields.tsx b/packages/protoflow/src/fields/ColorFields.tsx
@@ -143,7 +143,7 @@ export default ({ nodeData = {}, node, item }) => {
                             width: "28px", height: "28px", cursor: 'pointer',
                             backgroundColor: getColorPreview(),
                             borderRadius: 4, zIndex: 10, position: 'absolute', marginLeft: '5px',
-                            border: !value ? '1px solid ' + textColor : '', top: '13px'
+                            border: !value ? '1px solid ' + textColor : '', top: '-13px'
                         }}
                     >
                     </div>

diff --git a/packages/protoflow/src/fields/index.tsx b/packages/protoflow/src/fields/index.tsx
@@ -93,7 +93,7 @@ export const CustomField = ({ label, input, menuActions = undefined }: any) => {
                         <Popover.Trigger>
                             <div
                                 onClick={() => setMenuOpened(true)}
-                                style={{ padding: '4px', justifyContent: 'center', cursor: 'pointer', position: 'absolute', right: 0, alignSelf: 'center', zIndex: 10 }}
+                                style={{ padding: '4px', justifyContent: 'center', cursor: 'pointer', position: 'absolute', right: -10, top: 2, alignSelf: 'center', zIndex: 10 }}
                             >
                                 <MoreVertical size={16} color={useTheme('textColor')} />
                             </div>

diff --git a/packages/protolib/components/EditableObject/ArrayComponent.tsx b/packages/protolib/components/EditableObject/ArrayComponent.tsx
@@ -1,6 +1,6 @@
 import { Button, Stack, XStack } from "tamagui";
-import { Pencil, X, Tags, Layers } from '@tamagui/lucide-icons';
-import { Tinted } from 'protolib'
+import { Pencil, Tags, Layers } from '@tamagui/lucide-icons';
+import { Tinted } from 'protolib/components/Tinted';
 import { DeleteButton, FormGroup, getDefaultValue, iconStyle } from ".";
 
 export const ArrayComp = ({ ele, elementDef, icon, path, arrData, getElement, setFormData, data, setData, mode, customFields, URLTransform }) => {

diff --git a/packages/protolib/components/EditableObject/Element.tsx b/packages/protolib/components/EditableObject/Element.tsx
@@ -1,5 +1,8 @@
 import { Input, Stack, Switch, SizableText } from "tamagui";
-import { API, Tinted, SelectList, SimpleSlider, DatePicker } from 'protolib'
+import { Tinted } from 'protolib/components/Tinted';
+import { SelectList } from 'protolib/components/SelectList';
+import { SimpleSlider } from 'protolib/components/SimpleSlider';
+import { DatePicker } from 'protolib/components/datepickers/dateParts';
 import { InputColor } from "../InputColor";
 import { SearchAndSelect } from "../SearchAndSelect";
 import { FormElement } from ".";