Skip to content

Remove custom styling for toggles in Connect #36608

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
gzdunek merged 2 commits into from
Jan 12, 2024
Merged

Remove custom styling for toggles in Connect #36608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a24a1e
Remove custom styling for toggles
gzdunek Jan 12, 2024
a47291f
Remove unused import and unneeded props interface
gzdunek Jan 12, 2024
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: 1 addition & 10 deletions web/packages/teleterm/src/ui/Search/pickers/ActionPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,16 +1030,7 @@ function ContentAndAdvancedSearch(
<Flex gap={2} justifyContent="space-between" alignItems="flex-start">
{props.children}
{props.advancedSearch && (
<AdvancedSearchToggle
{...props.advancedSearch}
css={`
//TODO(gzdunek): Remove when we get a toggle that can be displayed
// on a white background
label > div {
border: 1px solid ${props => props.theme.colors.spotBackground[1]};
}
`}
/>
<AdvancedSearchToggle {...props.advancedSearch} />
)}
</Flex>
);
Expand Down
30 changes: 9 additions & 21 deletions web/packages/teleterm/src/ui/StatusBar/ShareFeedback/ShareFeedbackFormFields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,22 @@
*/

import React from 'react';
import styled from 'styled-components';
import FieldInput from 'shared/components/FieldInput';
import { requiredField } from 'shared/components/Validation/rules';
import { FieldTextArea } from 'shared/components/FieldTextArea';
import { Text, Toggle } from 'design';

import { ShareFeedbackFormValues } from './types';

interface ShareFeedbackFormProps {
disabled: boolean;
formValues: ShareFeedbackFormValues;

setFormValues(values: ShareFeedbackFormValues): void;
}

export function ShareFeedbackFormFields({
formValues,
setFormValues,
disabled,
}: ShareFeedbackFormProps) {
}: {
disabled: boolean;
formValues: ShareFeedbackFormValues;
setFormValues(values: ShareFeedbackFormValues): void;
}) {
function updateFormField<T extends keyof ShareFeedbackFormValues>(
field: T,
value: ShareFeedbackFormValues[T]
Expand Down Expand Up @@ -85,7 +81,7 @@ export function ShareFeedbackFormFields({
onChange={e => updateFormField('feedback', e.target.value)}
placeholder="Type your suggestions here"
/>
<ToggleWithCustomStyling
<Toggle
disabled={disabled}
isToggled={formValues.newsletterEnabled}
onToggle={() => {
Expand All @@ -95,8 +91,8 @@ export function ShareFeedbackFormFields({
<Text ml={2} color="text.main">
Sign me up for the newsletter
</Text>
</ToggleWithCustomStyling>
<ToggleWithCustomStyling
</Toggle>
<Toggle
disabled={disabled}
isToggled={formValues.salesContactEnabled}
onToggle={() => {
Expand All @@ -115,15 +111,7 @@ export function ShareFeedbackFormFields({
>
I would like a demo of Teleport&nbsp;Enterprise features
</Text>
</ToggleWithCustomStyling>
</Toggle>
</>
);
}

// Custom styling for the toggle to make it readable on a light background.
// TODO(gzdunek): remove when design team finish work on this form control.
const ToggleWithCustomStyling = styled(Toggle)`
> div:first-of-type {
border: 1px solid ${props => props.theme.colors.spotBackground[1]};
}
`;