Skip to content

Added double click to almost all components #1754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Added double click to almost all components #1754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion client/packages/lowcoder/src/comps/comps/avatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { IconControl } from "comps/controls/iconControl";
import {
clickEvent,
eventHandlerControl,
doubleClickEvent,
} from "../controls/eventHandlerControl";
import { Avatar, AvatarProps, Badge, Dropdown, Menu } from "antd";
import { LeftRightControl, dropdownControl } from "../controls/dropdownControl";
Expand Down Expand Up @@ -106,7 +107,7 @@ padding: ${props=>props.$style.padding};
background: ${props=>props.$style.background};
text-decoration: ${props => props.$style.textDecoration};
`
const EventOptions = [clickEvent] as const;
const EventOptions = [clickEvent, doubleClickEvent] as const;
const sharpOptions = [
{ label: trans("avatarComp.square"), value: "square" },
{ label: trans("avatarComp.circle"), value: "circle" },
Expand Down Expand Up @@ -183,6 +184,7 @@ const AvatarView = (props: RecordConstructorToView<typeof childrenMap>) => {
src={src.value}
// $cursorPointer={eventsCount > 0}
onClick={() => props.onEvent("click")}
onDoubleClick={() => props.onEvent("doubleClick")}
>
{title.value}
</AvatarWrapper>
Expand Down
7 changes: 5 additions & 2 deletions client/packages/lowcoder/src/comps/comps/avatarGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { hiddenPropertyView } from "comps/utils/propertyUtils";
import { trans } from "i18n";
import { NumberControl, StringControl } from "comps/controls/codeControl";
import { Avatar, Tooltip } from "antd";
import { clickEvent, eventHandlerControl, refreshEvent } from "../controls/eventHandlerControl";
import { clickEvent, doubleClickEvent, eventHandlerControl, refreshEvent } from "../controls/eventHandlerControl";
import styled from "styled-components";
import { useContext, ReactElement, useEffect } from "react";
import { MultiCompBuilder, stateComp, withDefault } from "../generators";
Expand Down Expand Up @@ -77,7 +77,7 @@ const DropdownOption = new MultiCompBuilder(
))
.build();

const EventOptions = [clickEvent, refreshEvent] as const;
const EventOptions = [clickEvent, refreshEvent, doubleClickEvent] as const;

export const alignOptions = [
{ label: <AlignLeft />, value: "flex-start" },
Expand Down Expand Up @@ -128,6 +128,9 @@ const AvatarGroupView = (props: RecordConstructorToView<typeof childrenMap> & {
props.onEvent("click")
props.dispatch(changeChildAction("currentAvatar", item as JSONObject, false));
}}
onDoubleClick={() => {
props.onEvent("doubleClick")
}}
>
{item.label}
</Avatar>
Expand Down
7 changes: 6 additions & 1 deletion client/packages/lowcoder/src/comps/comps/commentComp/commentComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
eventHandlerControl,
deleteEvent,
mentionEvent,
doubleClickEvent,
} from "comps/controls/eventHandlerControl";

import { EditorContext } from "comps/editorState";
Expand Down Expand Up @@ -80,6 +81,7 @@ dayjs.extend(relativeTime);

const EventOptions = [
clickEvent,
doubleClickEvent,
submitEvent,
deleteEvent,
mentionEvent,
Expand Down Expand Up @@ -290,7 +292,10 @@ const CommentCompBase = (
<List.Item.Meta
avatar={generateCommentAvatar(item)}
title={
<div onClick={() => props.onEvent("click")}>
<div
onClick={() => props.onEvent("click")}
onDoubleClick={() => props.onEvent("doubleClick")}
>
<a>{item?.user?.name}</a>
<Tooltip
title={
Expand Down
4 changes: 3 additions & 1 deletion client/packages/lowcoder/src/comps/comps/iconComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { AutoHeightControl } from "../controls/autoHeightControl";
import {
clickEvent,
eventHandlerControl,
doubleClickEvent,
} from "../controls/eventHandlerControl";
import { useContext } from "react";
import { EditorContext } from "comps/editorState";
Expand Down Expand Up @@ -72,7 +73,7 @@ const Container = styled.div<{
`}
`;

const EventOptions = [clickEvent] as const;
const EventOptions = [clickEvent, doubleClickEvent] as const;

const ModeOptions = [
{ label: "Standard", value: "standard" },
Expand Down Expand Up @@ -135,6 +136,7 @@ const IconView = (props: RecordConstructorToView<typeof childrenMap>) => {
$animationStyle={props.animationStyle}
style={style}
onClick={() => props.onEvent("click")}
onDoubleClick={() => props.onEvent("doubleClick")}
>
{ props.sourceMode === 'standard'
? (props.icon || '')
Expand Down
4 changes: 3 additions & 1 deletion client/packages/lowcoder/src/comps/comps/imageComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Section, sectionNames } from "lowcoder-design";
import {
clickEvent,
eventHandlerControl,
doubleClickEvent,
} from "../controls/eventHandlerControl";
import { StringStateControl } from "../controls/codeStateControl";
import { UICompBuilder, withDefault } from "../generators";
Expand Down Expand Up @@ -112,7 +113,7 @@ const getStyle = (style: ImageStyleType) => {
`;
};

const EventOptions = [clickEvent] as const;
const EventOptions = [clickEvent, doubleClickEvent] as const;
const ModeOptions = [
{ label: "URL", value: "standard" },
{ label: "Asset Library", value: "asset-library" },
Expand Down Expand Up @@ -212,6 +213,7 @@ const ContainerImg = (props: RecordConstructorToView<typeof childrenMap>) => {
preview={props.supportPreview ? {src: props.previewSrc || props.src.value } : false}
fallback={DEFAULT_IMG_URL}
onClick={() => props.onEvent("click")}
onDoubleClick={() => props.onEvent("doubleClick")}
/>
</div>
</Container>
Expand Down
10 changes: 8 additions & 2 deletions .../packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnAvatarsComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { avatarGroupStyle, AvatarGroupStyleType } from "comps/controls/styleCont
import { AlignCenter, AlignLeft, AlignRight } from "lowcoder-design";
import { NumberControl } from "comps/controls/codeControl";
import { Avatar, Tooltip } from "antd";
import { clickEvent, eventHandlerControl, refreshEvent } from "comps/controls/eventHandlerControl";
import { clickEvent, eventHandlerControl, refreshEvent, doubleClickEvent } from "comps/controls/eventHandlerControl";
import React, { ReactElement, useCallback, useEffect, useRef } from "react";
import { IconControl } from "comps/controls/iconControl";
import { ColorControl } from "comps/controls/colorControl";
Expand Down Expand Up @@ -68,7 +68,7 @@ const DropdownOption = new MultiCompBuilder(
})
.build();

const EventOptions = [clickEvent, refreshEvent] as const;
const EventOptions = [clickEvent, refreshEvent, doubleClickEvent] as const;

export const alignOptions = [
{ label: <AlignLeft />, value: "flex-start" },
Expand Down Expand Up @@ -106,6 +106,11 @@ const MemoizedAvatar = React.memo(({
onEvent("click");
}, [onEvent]);

const handleDoubleClick = useCallback(() => {
if (!mountedRef.current) return;
onEvent("doubleClick");
}, [onEvent]);

return (
<Tooltip title={item.Tooltip} key={index}>
<Avatar
Expand All @@ -117,6 +122,7 @@ const MemoizedAvatar = React.memo(({
}}
size={avatarSize}
onClick={handleClick}
onDoubleClick={handleDoubleClick}
>
{item.label}
</Avatar>
Expand Down
10 changes: 8 additions & 2 deletions ...packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnDropdownComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { ButtonStyle } from "comps/controls/styleControlConstants";
import { Button100 } from "comps/comps/buttonComp/buttonCompConstants";
import styled from "styled-components";
import { ButtonType } from "antd/es/button";
import { clickEvent, eventHandlerControl } from "comps/controls/eventHandlerControl";
import { clickEvent, eventHandlerControl, doubleClickEvent } from "comps/controls/eventHandlerControl";

const StyledButton = styled(Button100)`
display: flex;
Expand All @@ -29,7 +29,7 @@ const StyledIconWrapper = styled(IconWrapper)`
margin: 0;
`;

const DropdownEventOptions = [clickEvent] as const;
const DropdownEventOptions = [clickEvent, doubleClickEvent] as const;

const childrenMap = {
buttonType: dropdownControl(ButtonTypeOptions, "primary"),
Expand Down Expand Up @@ -67,10 +67,16 @@ const DropdownMenu = React.memo(({ items, options, onEvent }: { items: any[]; op
e.preventDefault();
}, []);

const handleDoubleClick = useCallback((e: React.MouseEvent) => {
if (!mountedRef.current) return;
onEvent?.("doubleClick");
}, [onEvent]);

return (
<Menu
items={items}
onClick={handleClick}
onDoubleClick={handleDoubleClick}
onMouseDown={handleMouseDown}
/>
);
Expand Down
11 changes: 9 additions & 2 deletions client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnLinkComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import { disabledPropertyView } from "comps/utils/propertyUtils";
import styled, { css } from "styled-components";
import { styleControl } from "comps/controls/styleControl";
import { TableColumnLinkStyle } from "comps/controls/styleControlConstants";
import { clickEvent, eventHandlerControl } from "comps/controls/eventHandlerControl";
import { clickEvent, eventHandlerControl, doubleClickEvent } from "comps/controls/eventHandlerControl";

export const ColumnValueTooltip = trans("table.columnValueTooltip");

const LinkEventOptions = [clickEvent] as const;
const LinkEventOptions = [clickEvent, doubleClickEvent] as const;

const childrenMap = {
text: StringControl,
Expand Down Expand Up @@ -44,10 +44,17 @@ export const ColumnLink = React.memo(({ disabled, label, onEvent }: { disabled:
}
}, [disabled, onEvent]);

const handleDoubleClick = useCallback(() => {
if (!disabled && onEvent) {
onEvent("doubleClick");
}
}, [disabled, onEvent]);

return (
<StyledLink
$disabled={disabled}
onClick={handleClick}
onDoubleClick={handleDoubleClick}
>
{label}
</StyledLink>
Expand Down
10 changes: 7 additions & 3 deletions ...nt/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnLinksComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { trans } from "i18n";
import styled from "styled-components";
import { ColumnLink } from "comps/comps/tableComp/column/columnTypeComps/columnLinkComp";
import { LightActiveTextColor, PrimaryColor } from "constants/style";
import { clickEvent, eventHandlerControl } from "comps/controls/eventHandlerControl";
import { clickEvent, eventHandlerControl, doubleClickEvent } from "comps/controls/eventHandlerControl";

const MenuLinkWrapper = styled.div`
> a {
Expand Down Expand Up @@ -38,7 +38,7 @@ const MenuWrapper = styled.div`
}
`;

const LinksEventOptions = [clickEvent] as const;
const LinksEventOptions = [clickEvent, doubleClickEvent] as const;

// Update OptionItem to include event handlers
const OptionItem = new MultiCompBuilder(
Expand Down Expand Up @@ -76,11 +76,15 @@ const MenuItem = React.memo(({ option, index }: { option: any; index: number })
if (option.onClick) {
option.onClick();
}
if (option.onDoubleClick) {
option.onDoubleClick();
}
if (option.onEvent) {
option.onEvent("click");
}

}
}, [option.disabled, option.onClick, option.onEvent]);
}, [option.disabled, option.onClick, option.onEvent, option.onDoubleClick]);

return (
<MenuLinkWrapper>
Expand Down
13 changes: 8 additions & 5 deletions ...t/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnSelectComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { trans } from "i18n";
import { ColumnTypeCompBuilder, ColumnTypeViewFn } from "../columnTypeCompBuilder";
import { ColumnValueTooltip } from "../simpleColumnTypeComps";
import { styled } from "styled-components";
import { clickEvent, eventHandlerControl } from "comps/controls/eventHandlerControl";
import { clickEvent, eventHandlerControl, doubleClickEvent } from "comps/controls/eventHandlerControl";

const Wrapper = styled.div`
display: inline-flex;
Expand Down Expand Up @@ -79,7 +79,7 @@ const Wrapper = styled.div`
}
`;

const SelectOptionEventOptions = [clickEvent] as const;
const SelectOptionEventOptions = [clickEvent, doubleClickEvent] as const;

// Create a new option type with event handlers for each option
const SelectOptionWithEvents = new MultiCompBuilder(
Expand Down Expand Up @@ -144,11 +144,14 @@ const SelectEdit = React.memo((props: SelectEditProps) => {
if (!mountedRef.current) return;
props.onChange(val);
setCurrentValue(val);

// Trigger the specific option's event handler
const selectedOption = props.options.find(option => option.value === val);
if (selectedOption && selectedOption.onEvent) {
selectedOption.onEvent("click");
if (selectedOption?.onEvent) {
if (selectedOption.onEvent.isBind("click")) {
selectedOption.onEvent("click");
} else if (selectedOption.onEvent.isBind("doubleClick")) {
selectedOption.onEvent("doubleClick");
}
}
}, [props.onChange, props.options]);

Expand Down
9 changes: 7 additions & 2 deletions client/packages/lowcoder/src/comps/comps/tableComp/column/simpleColumnTypeComps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import React, { useCallback, useEffect, useMemo } from "react";
import { CSSProperties } from "react";
import { RecordConstructorToComp } from "lowcoder-core";
import { ToViewReturn } from "@lowcoder-ee/comps/generators/multi";
import { clickEvent, eventHandlerControl } from "comps/controls/eventHandlerControl";
import { clickEvent, eventHandlerControl, doubleClickEvent } from "comps/controls/eventHandlerControl";

export const ColumnValueTooltip = trans("table.columnValueTooltip");

Expand All @@ -32,7 +32,7 @@ export const ButtonTypeOptions = [
},
] as const;

const ButtonEventOptions = [clickEvent] as const;
const ButtonEventOptions = [clickEvent, doubleClickEvent] as const;

const childrenMap = {
text: StringControl,
Expand All @@ -55,6 +55,10 @@ const ButtonStyled = React.memo(({ props }: { props: ToViewReturn<RecordConstruc
props.onEvent("click");
}, [props.onEvent]);

const handleDoubleClick = useCallback((e: React.MouseEvent) => {
props.onEvent("doubleClick");
}, [props.onEvent]);

const buttonStyle = useMemo(() => ({
margin: 0,
width: iconOnly ? 'auto' : undefined,
Expand All @@ -71,6 +75,7 @@ const ButtonStyled = React.memo(({ props }: { props: ToViewReturn<RecordConstruc
$buttonStyle={props.buttonType === "primary" ? style : undefined}
style={buttonStyle}
icon={hasPrefixIcon ? props.prefixIcon : undefined}
onDoubleClick={handleDoubleClick}
>
{/* prevent the button from disappearing */}
{hasText ? props.text : (iconOnly ? null : " ")}
Expand Down
9 changes: 6 additions & 3 deletions client/packages/lowcoder/src/comps/comps/textComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ import { PaddingControl } from "../controls/paddingControl";

import React, { useContext, useEffect, useRef, useMemo } from "react";
import { EditorContext } from "comps/editorState";
import { clickEvent, eventHandlerControl } from "../controls/eventHandlerControl";
import { clickEvent, doubleClickEvent, eventHandlerControl } from "../controls/eventHandlerControl";
import { NewChildren } from "../generators/uiCompBuilder";
import { RecordConstructorToComp } from "lowcoder-core";
import { ToViewReturn } from "../generators/multi";
import { BoolControl } from "../controls/boolControl";

const EventOptions = [clickEvent] as const;
const EventOptions = [clickEvent, doubleClickEvent] as const;

const getStyle = (style: TextStyleType) => {
return css`
Expand Down Expand Up @@ -227,7 +227,9 @@ const TextView = React.memo((props: ToViewReturn<ChildrenType>) => {
const handleClick = React.useCallback(() => {
props.onEvent("click");
}, [props.onEvent]);

const handleDoubleClick = React.useCallback(() => {
props.onEvent("doubleClick");
}, [props.onEvent]);
const containerStyle = useMemo(() => ({
justifyContent: props.horizontalAlignment,
alignItems: props.autoHeight ? "center" : props.verticalAlignment,
Expand All @@ -247,6 +249,7 @@ const TextView = React.memo((props: ToViewReturn<ChildrenType>) => {
$styleConfig={props.style}
style={containerStyle}
onClick={handleClick}
onDoubleClick={handleDoubleClick}
>
<ScrollBar hideScrollbar={!props.contentScrollBar}>
{content}
Expand Down
Loading
Loading