Skip to content

Commit

Permalink
chore: Moves CheckboxIcons to Checkbox folder (#13459)
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-s-molina authored Mar 30, 2021
1 parent 6fe4cc0 commit 3c4591e
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 39 deletions.
6 changes: 4 additions & 2 deletions superset-frontend/src/components/Checkbox/Checkbox.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ import {
styledShallow as shallow,
} from 'spec/helpers/theming';

import Checkbox from '.';
import { CheckboxChecked, CheckboxUnchecked } from '../CheckboxIcons';
import Checkbox, {
CheckboxChecked,
CheckboxUnchecked,
} from 'src/components/Checkbox';

describe('Checkbox', () => {
let wrapper: ReactWrapper;
Expand Down
51 changes: 51 additions & 0 deletions superset-frontend/src/components/Checkbox/Checkbox.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import React from 'react';
import { styled } from '@superset-ui/core';
import { CheckboxChecked, CheckboxUnchecked } from 'src/components/Checkbox';

interface CheckboxProps {
checked: boolean;
onChange: (val?: boolean) => void;
style?: React.CSSProperties;
}

const Styles = styled.span`
&,
& svg {
vertical-align: top;
}
`;

export default function Checkbox({ checked, onChange, style }: CheckboxProps) {
return (
<Styles
style={style}
onClick={() => {
onChange(!checked);
}}
role="checkbox"
tabIndex={0}
aria-checked={checked}
aria-label="Checkbox"
>
{checked ? <CheckboxChecked /> : <CheckboxUnchecked />}
</Styles>
);
}
38 changes: 2 additions & 36 deletions superset-frontend/src/components/Checkbox/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,39 +16,5 @@
* specific language governing permissions and limitations
* under the License.
*/
import React from 'react';
import { styled } from '@superset-ui/core';
import {
CheckboxChecked,
CheckboxUnchecked,
} from 'src/components/CheckboxIcons';

interface CheckboxProps {
checked: boolean;
onChange: (val?: boolean) => void;
style?: React.CSSProperties;
}

const Styles = styled.span`
&,
& svg {
vertical-align: top;
}
`;

export default function Checkbox({ checked, onChange, style }: CheckboxProps) {
return (
<Styles
style={style}
onClick={() => {
onChange(!checked);
}}
role="checkbox"
tabIndex={0}
aria-checked={checked}
aria-label="Checkbox"
>
{checked ? <CheckboxChecked /> : <CheckboxUnchecked />}
</Styles>
);
}
export { default } from 'src/components/Checkbox/Checkbox';
export * from 'src/components/Checkbox/CheckboxIcons';
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
CheckboxChecked,
CheckboxUnchecked,
CheckboxHalfChecked,
} from '../../../components/CheckboxIcons';
} from 'src/components/Checkbox/CheckboxIcons';

const treeIcons = {
check: <CheckboxChecked />,
Expand Down

0 comments on commit 3c4591e

Please sign in to comment.