Merge pull request #3352 from GeekyAnts/revert-3240-feat/accordianDis…

…ableRow Revert "Feat/accordian disable row"
GeekyAnts · Jan 7, 2021 · 6e2ca10 · 6e2ca10
2 parents f48f8a7 + a3e78a1
commit 6e2ca10
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 23 deletions.
diff --git a/src/basic/Accordion.js b/src/basic/Accordion.js
@@ -23,7 +23,6 @@ const styles = StyleSheet.create({
 class DefaultHeader extends React.Component {
   render() {
     const {
-      disable,
       expanded,
       expandedIcon,
       expandedIconStyle,
@@ -42,10 +41,7 @@ class DefaultHeader extends React.Component {
           headerStyle || { backgroundColor: variables.headerStyle }
         ]}
       >
-        <Text style={{ color: disable ? variable.disableRow : null }}>
-          {' '}
-          {title}
-        </Text>
+        <Text> {title}</Text>
         <Icon
           style={[
             { fontSize: variables.accordionIconFontSize },
@@ -55,8 +51,7 @@ class DefaultHeader extends React.Component {
                 : { color: variables.expandedIconStyle }
               : icon && iconStyle
               ? iconStyle
-              : { color: disable ? variable.disableRow : variables.iconStyle },
-
+              : { color: variables.iconStyle }
           ]}
           name={
             expanded ? expandedIcon || 'ios-arrow-up' : icon || 'ios-arrow-down'
@@ -112,7 +107,6 @@ class AccordionItem extends React.Component {
   render() {
     const {
       contentStyle,
-      disable,
       expanded,
       expandedIcon,
       expandedIconStyle,
@@ -130,7 +124,6 @@ class AccordionItem extends React.Component {
     return (
       <View>
         <TouchableWithoutFeedback
-          disabled={disable}
           onPress={() => {
             onAccordionOpen && !expanded && onAccordionOpen(item, index);
             onAccordionClose && expanded && onAccordionClose(item, index);
@@ -142,7 +135,7 @@ class AccordionItem extends React.Component {
               renderHeader(item, expanded, index)
             ) : (
               <DefaultHeader
-                disable={disable}
+                title={item.title}
                 expanded={expanded}
                 headerStyle={headerStyle}
                 icon={icon}
@@ -181,7 +174,7 @@ export class Accordion extends React.Component {
       selected = expandMultiple ? selected : selected.slice(0, 1);
     }
     this.state = {
-      selected: props.expanded,
+      selected
     };
   }
 
@@ -201,7 +194,6 @@ export class Accordion extends React.Component {
     const {
       contentStyle,
       dataArray,
-      disable,
       expandedIcon,
       expandedIconStyle,
       headerStyle,
@@ -230,7 +222,6 @@ export class Accordion extends React.Component {
         keyExtractor={(item, index) => String(index)}
         renderItem={({ item, index }) => (
           <AccordionItem
-            disable={disable == index ? true : false}
             key={String(index)}
             item={item}
             expanded={this.state.selected.indexOf(index) !== -1}
@@ -246,7 +237,6 @@ export class Accordion extends React.Component {
             expandedIconStyle={expandedIconStyle}
             onAccordionOpen={onAccordionOpen}
             onAccordionClose={onAccordionClose}
-            setSelected={(i) => this.setSelected(i)}
           />
         )}
         {...this.props}

diff --git a/src/theme/variables/commonColor.js b/src/theme/variables/commonColor.js
@@ -31,7 +31,6 @@ export default {
   contentStyle: '#f5f4f5',
   expandedIconStyle: '#000',
   accordionBorderColor: '#d3d3d3',
-  disableRow: '#a9a9a9',
 
   // ActionSheet
   elevation: 4,

diff --git a/src/theme/variables/material.js b/src/theme/variables/material.js
@@ -26,7 +26,6 @@ export default {
   contentStyle: '#f5f4f5',
   expandedIconStyle: '#000',
   accordionBorderColor: '#d3d3d3',
-  disableRow: '#a9a9a9',
 
   // ActionSheet
   elevation: 4,
@@ -181,10 +180,14 @@ export default {
   toolbarDefaultBorder: '#3F51B5',
   iosStatusbar: 'light-content',
   get statusBarColor() {
-    return color(this.toolbarDefaultBg).darken(0.2).hex();
+    return color(this.toolbarDefaultBg)
+      .darken(0.2)
+      .hex();
   },
   get darkenHeader() {
-    return color(this.tabBgColor).darken(0.03).hex();
+    return color(this.tabBgColor)
+      .darken(0.03)
+      .hex();
   },
 
   // Icon
@@ -289,13 +292,13 @@ export default {
       topInset: 24,
       leftInset: 0,
       rightInset: 0,
-      bottomInset: 34,
+      bottomInset: 34
     },
     landscape: {
       topInset: 0,
       leftInset: 44,
       rightInset: 44,
-      bottomInset: 21,
-    },
-  },
+      bottomInset: 21
+    }
+  }
 };
diff --git a/src/theme/variables/platform.js b/src/theme/variables/platform.js
@@ -28,7 +28,6 @@ export default {
   expandedIconStyle: '#000',
   headerStyle: '#edebed',
   iconStyle: '#000',
-  disableRow: '#a9a9a9',
 
   // ActionSheet
   elevation: 4,