Skip to content

Tooltips - Properties view #1707

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

Merged
FalkWolsky merged 1 commit into from
May 24, 2025
Merged

Tooltips - Properties view #1707

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/buttonComp/buttonComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ const childrenMap = {
style: ButtonStyleControl,
animationStyle: styleControl(AnimationStyle, 'animationStyle'),
viewRef: RefControl<HTMLElement>,
tooltip: StringControl
};

type ChildrenType = NewChildren<RecordConstructorToComp<typeof childrenMap>>;
Expand All @@ -146,6 +147,7 @@ const ButtonPropertyView = React.memo((props: {
<>
<Section name={sectionNames.basic}>
{props.children.text.propertyView({ label: trans("text") })}
{props.children.tooltip.propertyView({ label: trans("labelProp.tooltip")})}
</Section>

{(editorModeStatus === "logic" || editorModeStatus === "both") && (
Expand Down Expand Up @@ -204,7 +206,7 @@ const ButtonView = React.memo((props: ToViewReturn<ChildrenType>) => {
<ButtonCompWrapper $disabled={props.disabled}>
<EditorContext.Consumer>
{(editorState) => (
<Tooltip title={props.text}>
<Tooltip title={props.tooltip}>
<Button100
ref={props.viewRef}
$buttonStyle={props.style}
Expand Down
4 changes: 3 additions & 1 deletion client/packages/lowcoder/src/comps/comps/buttonComp/toggleButtonComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ const ToggleTmpComp = (function () {
animationStyle: styleControl(AnimationStyle , 'animationStyle'),
showBorder: withDefault(BoolControl, true),
viewRef: RefControl<HTMLElement>,
tooltip: StringControl,
};
return new UICompBuilder(childrenMap, (props) => {
const text = props.showText
Expand All @@ -79,7 +80,7 @@ const ToggleTmpComp = (function () {
$showBorder={props.showBorder}
$animationStyle={props.animationStyle}
>
<Tooltip title={props.value.value ? props.trueText : props.falseText}>
<Tooltip title={props.tooltip}>
<Button100
ref={props.viewRef}
$buttonStyle={props.style}
Expand Down Expand Up @@ -117,6 +118,7 @@ const ToggleTmpComp = (function () {
</Section>
<Section name={sectionNames.advanced}>
{children.showText.propertyView({ label: trans("toggleButton.showText") })}
{children.tooltip.propertyView({label: trans("labelProp.tooltip")})}
{children.showText.getView() &&
children.trueText.propertyView({ label: trans("toggleButton.trueLabel") })}
{children.showText.getView() &&
Expand Down
8 changes: 6 additions & 2 deletions client/packages/lowcoder/src/comps/comps/meetingComp/controlButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@ const childrenMap = {
iconScoutAsset: IconscoutControl(AssetType.ICON),
style: ButtonStyleControl,
viewRef: RefControl<HTMLElement>,
restrictPaddingOnRotation:withDefault(StringControl, 'controlButton')
restrictPaddingOnRotation:withDefault(StringControl, 'controlButton'),
tooltip: StringControl
};

let ButtonTmpComp = (function () {
Expand Down Expand Up @@ -259,7 +260,7 @@ let ButtonTmpComp = (function () {
: undefined
}
>
<Tooltip title={trans("meeting.meetingControlCompName")}>
<Tooltip title={props.tooltip}>
<Button100
ref={props.viewRef}
$buttonStyle={props.style}
Expand Down Expand Up @@ -323,6 +324,9 @@ let ButtonTmpComp = (function () {
{children.sourceMode.getView() === 'asset-library' &&children.iconScoutAsset.propertyView({
label: trans("button.icon"),
})}
{children.tooltip.propertyView({
label: trans("labelProp.tooltip"),
})}
</Section>

{(useContext(EditorContext).editorModeStatus === "logic" ||
Expand Down
6 changes: 1 addition & 5 deletions client/packages/lowcoder/src/comps/comps/selectInputComp/checkboxComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,7 @@ let CheckboxBasicComp = (function () {
return props.options
.filter((option) => option.value !== undefined && !option.hidden)
.map((option) => ({
label: (
<Tooltip title={option.label}>
<span>{option.label}</span>
</Tooltip>
),
label: option.label,
value: option.value,
disabled: option.disabled,
}));
Expand Down
6 changes: 1 addition & 5 deletions client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,7 @@ const MemoizedRadio = memo(({
return options
.filter((option) => option.value !== undefined && !option.hidden)
.map((option) => ({
label: (
<Tooltip title={option.label}>
<span>{option.label}</span>
</Tooltip>
),
label: option.label,
value: option.value,
disabled: option.disabled,
}));
Expand Down
Loading