refactor(ui): radio/checkbox size variant remove

akveo · May 27, 2019 · ecb6568 · ecb6568
1 parent 50ef9fe
commit ecb6568
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 498 deletions.
diff --git a/config/dev.env.js b/config/dev.env.js
@@ -6,6 +6,6 @@ module.exports = {
   ENV: 'dev',
   KITTEN_PATH: path.resolve(__dirname, '../src/framework'),
   MAPPING_PATH: path.resolve(evaPath, 'packages/mapping/eva'),
-  THEME_PATH: path.resolve(evaPath, 'packages/theme/eva'),
+  THEME_PATH: path.resolve(evaPath, 'packages/themes'),
   PROCESSOR_PATH: path.resolve(evaPath, 'packages/processor/kitten')
 };
diff --git a/src/framework/ui/checkbox/checkbox.component.tsx b/src/framework/ui/checkbox/checkbox.component.tsx
@@ -37,7 +37,6 @@ interface ComponentProps {
   checked?: boolean;
   indeterminate?: boolean;
   status?: string;
-  size?: string;
   onChange?: (checked: boolean, indeterminate: boolean) => void;
 }
 
@@ -57,10 +56,6 @@ export type CheckBoxProps = StyledComponentProps & TouchableOpacityProps & Compo
  * Can be 'primary' | 'success' | 'info' | 'warning' | 'danger'.
  * By default status is 'primary'.
  *
- * @property {string} size - Determines the size of the component.
- * Can be 'tiny' | 'small' | 'medium' | 'large' | 'giant'.
- * By default size is 'medium'.
- *
  * @property {string} text - Determines text of the component.
  *
  * @property {StyleProp<TextStyle>} textStyle - Customizes text style.
@@ -97,7 +92,6 @@ export type CheckBoxProps = StyledComponentProps & TouchableOpacityProps & Compo
  *     <Checkbox
  *       checked={this.state.toggled}
  *       status='info'
- *       size='large'
  *       text='Place your text'
  *       textStyle={styles.checkboxText}
  *       onChange={this.onChange}
@@ -163,10 +157,11 @@ class CheckBoxComponent extends React.Component<CheckBoxProps> {
       outlineHeight,
       outlineBorderRadius,
       outlineBackgroundColor,
-      hitSlop,
       ...containerParameters
     } = source;
 
+    const hitSlop: number = 40 - containerParameters.width;
+
     return {
       container: {
         ...StyleSheet.flatten(style),

diff --git a/src/framework/ui/radio/radio.component.tsx b/src/framework/ui/radio/radio.component.tsx
@@ -33,7 +33,6 @@ interface ComponentProps {
   text?: string;
   checked?: boolean;
   status?: string;
-  size?: string;
   onChange?: (selected: boolean) => void;
 }
 
@@ -53,10 +52,6 @@ export type RadioProps = StyledComponentProps & TouchableOpacityProps & Componen
  * Can be 'primary' | 'success' | 'info' | 'warning' | 'danger'.
  * By default status='primary'.
  *
- * @property {string} size - Determines whether component is disabled.
- * Can be 'small' | 'medium' | 'large'.
- * By default size='medium'.
- *
  * @property {string} text - Determines text of the component.
  *
  * @property {StyleProp<TextStyle>} textStyle - Customizes text style.
@@ -155,10 +150,11 @@ export class RadioComponent extends React.Component<RadioProps> {
       outlineHeight,
       outlineBorderRadius,
       outlineBackgroundColor,
-      hitSlop,
       ...containerParameters
     } = source;
 
+    const hitSlop: number = 40 - containerParameters.width;
+
     return {
       container: {
         ...styles.container,

diff --git a/src/framework/ui/radio/radio.spec.tsx.snap b/src/framework/ui/radio/radio.spec.tsx.snap
@@ -88,7 +88,6 @@ exports[`@radio: matches snapshot default 1`] = `
       onPress={[Function]}
       onPressIn={[Function]}
       onPressOut={[Function]}
-      size="medium"
       style={
         Object {
           "alignItems": "center",

diff --git a/src/framework/ui/radioGroup/radioGroup.component.tsx b/src/framework/ui/radioGroup/radioGroup.component.tsx
@@ -64,7 +64,6 @@ export type RadioGroupProps = StyledComponentProps & ViewProps & ComponentProps;
  *       <Radio
  *         style={styles.radioButton}
  *         status='danger'
- *         size='small'
  *       />
  *       <Radio
  *         style={styles.radioButton}
@@ -73,7 +72,6 @@ export type RadioGroupProps = StyledComponentProps & ViewProps & ComponentProps;
  *       <Radio
  *         style={styles.radioButton}
  *         status='danger'
- *         size='large'
  *       />
  *     </RadioGroup>
  *   );