From 1b5b027b4d4f248a90a5e5e0456fd36eebd20fb7 Mon Sep 17 00:00:00 2001
From: piglier <45963571+piglier@users.noreply.github.com>
Date: Wed, 29 Jul 2020 08:12:35 +0800
Subject: [PATCH 1/5] Update TriangleColorPicker.js
---
src/TriangleColorPicker.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/TriangleColorPicker.js b/src/TriangleColorPicker.js
index e7715e1..fced74c 100644
--- a/src/TriangleColorPicker.js
+++ b/src/TriangleColorPicker.js
@@ -264,7 +264,8 @@ export class TriangleColorPicker extends React.PureComponent {
}
-
+ { this.props.hideControls === false &&
+
{oldColor &&
+ }
)
}
@@ -295,10 +297,12 @@ TriangleColorPicker.propTypes = {
onColorSelected: PropTypes.func,
onOldColorSelected: PropTypes.func,
rotationHackFactor: PropTypes.number,
+ hideControls: PropTypes.bool,
}
TriangleColorPicker.defaultProps = {
rotationHackFactor: 100,
+ hideControls: false,
}
function getPickerProperties(pickerSize) {
From 404c5d9be3743db051bb9d045e88fa5cf787846a Mon Sep 17 00:00:00 2001
From: piglier <45963571+piglier@users.noreply.github.com>
Date: Wed, 29 Jul 2020 10:42:03 +0800
Subject: [PATCH 2/5] Add HoloColorPickers HideIndicator props
---
src/HoloColorPicker.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/HoloColorPicker.js b/src/HoloColorPicker.js
index d36f5f7..edbbc97 100644
--- a/src/HoloColorPicker.js
+++ b/src/HoloColorPicker.js
@@ -163,7 +163,11 @@ export class HoloColorPicker extends React.PureComponent {
resizeMode='contain'
style={[styles.pickerImage]}
/>
-
+ {
+ this.props.hideIndicator === false &&
+
+ }
{oldColor &&
Date: Wed, 29 Jul 2020 11:56:14 +0800
Subject: [PATCH 3/5] Add HoloColorPicker hideColorCycle props
---
src/HoloColorPicker.js | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/HoloColorPicker.js b/src/HoloColorPicker.js
index edbbc97..7bd1017 100644
--- a/src/HoloColorPicker.js
+++ b/src/HoloColorPicker.js
@@ -163,11 +163,7 @@ export class HoloColorPicker extends React.PureComponent {
resizeMode='contain'
style={[styles.pickerImage]}
/>
- {
- this.props.hideIndicator === false &&
-
- }
+
{oldColor &&
}
- {!oldColor &&
+ {!oldColor && this.props.hideColorCycle === false &&
Date: Wed, 29 Jul 2020 18:23:36 +0800
Subject: [PATCH 4/5] Add HoloColorPicker a new props hideOldColor
---
src/HoloColorPicker.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/HoloColorPicker.js b/src/HoloColorPicker.js
index 7bd1017..e201c78 100644
--- a/src/HoloColorPicker.js
+++ b/src/HoloColorPicker.js
@@ -179,7 +179,7 @@ export class HoloColorPicker extends React.PureComponent {
activeOpacity={0.7}
/>
}
- {!oldColor && this.props.hideColorCycle === false &&
+ {!oldColor && this.props.hideOldColor === false &&
Date: Wed, 29 Jul 2020 18:28:26 +0800
Subject: [PATCH 5/5] Add TriangleColorPicker a new props hideOldColor
---
src/TriangleColorPicker.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/TriangleColorPicker.js b/src/TriangleColorPicker.js
index fced74c..70da520 100644
--- a/src/TriangleColorPicker.js
+++ b/src/TriangleColorPicker.js
@@ -264,7 +264,7 @@ export class TriangleColorPicker extends React.PureComponent {
}
- { this.props.hideControls === false &&
+ { this.props.hideOldColor === false &&
{oldColor &&