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

…accordianDisableRow Revert "Revert "Feat/accordian disable row""
GeekyAnts · Jan 7, 2021 · ee12a25 · ee12a25
2 parents d3d3d65 + 2de1a1b
commit ee12a25
Show file tree

Hide file tree

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