Skip to content

Refactor Expression Editor floating button styles for theming #925

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
merged 1 commit into from
Nov 16, 2025
+11 −22
Merged

Refactor Expression Editor floating button styles for theming #925

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
11 changes: 5 additions & 6 deletions ...ditors/MultiModeExpressionEditor/ChipExpressionEditor/components/ChipExpressionEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import { autocompletion } from "@codemirror/autocomplete";
import { FloatingButtonContainer, FloatingToggleButton, ChipEditorContainer } from "../styles";
import { HelperpaneOnChangeOptions } from "../../../../Form/types";
import { CompletionItem, FnSignatureDocumentation, HelperPaneHeight } from "@wso2/ui-toolkit";
import { CloseHelperIcon, ExpandIcon, OpenHelperIcon } from "./FloatingButtonIcons";
import { CloseHelperIcon, ExpandIcon, MinimizeIcon, OpenHelperIcon } from "./FloatingButtonIcons";
import { LineRange } from "@wso2/ballerina-core";
import FXButton from "./FxButton";
import { HelperPaneToggleButton } from "./HelperPaneToggleButton";
Expand Down Expand Up @@ -345,15 +345,14 @@ export const ChipExpressionEditorComponent = (props: ChipExpressionEditorCompone
{!props.isExpandedVersion &&
<FloatingToggleButton
ref={helperPaneToggleButtonRef}
isActive={helperPaneState.isOpen}
onClick={handleHelperPaneManualToggle}
title={helperPaneState.isOpen ? "Close Helper" : "Open Helper"}
title={helperPaneState.isOpen ? "Close Helper Panel" : "Open Helper Panel"}
>
{helperPaneState.isOpen ? <CloseHelperIcon /> : <OpenHelperIcon />}
</FloatingToggleButton>}
{props.onOpenExpandedMode && !props.isInExpandedMode && (
<FloatingToggleButton onClick={props.onOpenExpandedMode} title="Expand Editor" isActive={false}>
<ExpandIcon />
{props.onOpenExpandedMode && (
<FloatingToggleButton onClick={props.onOpenExpandedMode} title={props.isInExpandedMode ? "Minimize Editor" : "Expand Editor"}>
{props.isInExpandedMode ? <MinimizeIcon /> : <ExpandIcon />}
</FloatingToggleButton>
)}
</FloatingButtonContainer>
Expand Down
1 change: 0 additions & 1 deletion ...ditors/MultiModeExpressionEditor/ChipExpressionEditor/components/FloatingToggleButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ export const FloatingToggleButton: React.FC<FloatingToggleButtonProps> = ({
}) => {
return (
<StyledButton
isActive={isActive ?? false}
onClick={onClick}
title={title}
{...{[ARIA_PRESSED_ATTRIBUTE]: isActive ?? false}}
Expand Down
21 changes: 6 additions & 15 deletions ...de-panel/src/components/editors/MultiModeExpressionEditor/ChipExpressionEditor/styles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,13 +231,13 @@ export const FloatingButtonContainer = styled.div`
z-index: 1500;
`;

export const FloatingToggleButton = styled.button<{ isActive: boolean }>`
export const FloatingToggleButton = styled.button`
width: 16px;
height: 16px;
border: 1px solid ${props => props.isActive ? ThemeColors.PRIMARY : ThemeColors.OUTLINE};
border: 1px solid ${ThemeColors.OUTLINE};
border-radius: 2px;
background-color: ${props => props.isActive ? ThemeColors.PRIMARY : ThemeColors.SURFACE_CONTAINER};
color: ${props => props.isActive ? ThemeColors.ON_PRIMARY : ThemeColors.ON_SURFACE_VARIANT};
background-color: ${ThemeColors.SURFACE_CONTAINER};
color: ${ThemeColors.ON_SURFACE_VARIANT};
cursor: pointer;
display: flex;
align-items: center;
Expand All @@ -247,20 +247,11 @@ export const FloatingToggleButton = styled.button<{ isActive: boolean }>`
transition: background-color 0.1s ease, border-color 0.1s ease, color 0.1s ease, transform 0.1s ease;
outline: none;
padding: 0;
box-shadow: ${props => props.isActive ? `0 0 0 1px ${ThemeColors.PRIMARY}` : '0 1px 2px rgba(0, 0, 0, 0.15)'};
box-shadow: ${'0 1px 2px rgba(0, 0, 0, 0.15)'};
Copy link

Copilot AI Nov 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary template literal wrapping for the box-shadow value. This can be simplified to:

box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15);
Suggested change
box-shadow: ${'0 1px 2px rgba(0, 0, 0, 0.15)'};
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15);

Copilot uses AI. Check for mistakes.

&:hover {
background-color: ${props => props.isActive ? ThemeColors.PRIMARY_CONTAINER : ThemeColors.SURFACE_CONTAINER};
border-color: ${props => props.isActive ? ThemeColors.PRIMARY : ThemeColors.OUTLINE_VARIANT};
background-color: ${ThemeColors.SURFACE_DIM_2};
transform: scale(1.05);

svg {
color: ${ThemeColors.PRIMARY}cc;
}
}

&:active {
background-color: ${props => props.isActive ? ThemeColors.PRIMARY : ThemeColors.SURFACE_CONTAINER};
}

&:focus-visible {
Expand Down
Loading