2
0

🐛 (buttons) Fix dynamic buttons edge not showing

This commit is contained in:
Baptiste Arnaud
2023-02-23 19:22:32 +01:00
parent 0619c60970
commit e1b7320f6f
4 changed files with 13 additions and 16 deletions

View File

@ -90,8 +90,6 @@ const NonMemoizedDraggableGroupNode = ({
const [debouncedGroupPosition] = useDebounce(currentCoordinates, 100)
const [isFocused, setIsFocused] = useState(false)
const [ignoreNextFocusIntent, setIgnoreNextFocusIntent] = useState(false)
useOutsideClick({
handler: () => setIsFocused(false),
ref: groupRef,
@ -151,15 +149,15 @@ const NonMemoizedDraggableGroupNode = ({
}
useDrag(
({ first, last, offset: [offsetX, offsetY], distance, event, target }) => {
({ first, last, offset: [offsetX, offsetY], event, target }) => {
event.stopPropagation()
if ((target as HTMLElement).classList.contains('prevent-group-drag'))
return
if (first) {
setIsFocused(true)
setIsMouseDown(true)
}
if (last) {
if (distance[0] > 1 || distance[1] > 1) setIgnoreNextFocusIntent(true)
setIsMouseDown(false)
}
const newCoord = {
@ -179,14 +177,6 @@ const NonMemoizedDraggableGroupNode = ({
}
)
const focusGroup = () => {
if (ignoreNextFocusIntent) {
setIgnoreNextFocusIntent(false)
return
}
setIsFocused(true)
}
return (
<ContextMenu<HTMLDivElement>
renderMenu={() => <GroupNodeContextMenu groupIndex={groupIndex} />}
@ -195,7 +185,6 @@ const NonMemoizedDraggableGroupNode = ({
{(ref, isContextMenuOpened) => (
<Stack
ref={setMultipleRefs([ref, groupRef])}
onClick={focusGroup}
data-testid="group"
p="4"
rounded="xl"

View File

@ -56,6 +56,7 @@ import {
blockTypeHasItems,
isChoiceInput,
isConditionBlock,
isDefined,
} from 'utils'
const roundSize = 20
@ -456,4 +457,6 @@ const parseDefaultBlockOptions = (type: BlockWithOptionsType): BlockOptions => {
}
export const hasDefaultConnector = (block: Block) =>
!isChoiceInput(block) && !isConditionBlock(block)
(!isChoiceInput(block) && !isConditionBlock(block)) ||
(block.type === InputBlockType.CHOICE &&
isDefined(block.options.dynamicVariableId))

View File

@ -46,7 +46,7 @@ export const VariablesButton = ({ onSelectVariable, ...props }: Props) => {
<VariableSearchInput
onSelectVariable={(variable) => {
onClose()
onSelectVariable(variable)
if (variable) onSelectVariable(variable)
}}
placeholder="Search for a variable"
shadow="lg"