Merge pull request #461 from Kitware/widget-update

Widget update
Kitware · May 24, 2018 · 41247d9 · 41247d9
2 parents 56a32e3 + ecbb37e
commit 41247d9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/Common/Misc/ConvertProxyProperty/index.js b/src/Common/Misc/ConvertProxyProperty/index.js
@@ -131,6 +131,7 @@ export function proxyPropToProp(property, ui) {
       domain: ui.domain || extractDomain(ui),
       componentLabels: [],
       size: extractSize(ui),
+      sort: ui.sort,
     },
     data: {
       id: [property.id, property.name].join(':'),

diff --git a/src/React/Properties/EnumProperty/index.js b/src/React/Properties/EnumProperty/index.js
@@ -101,7 +101,12 @@ export default class EnumProperty extends React.Component {
         ret.push(<option key="empty-value" value={null} />);
       }
 
-      Object.keys(this.props.ui.domain).forEach((key) => {
+      const keys = Object.keys(this.props.ui.domain);
+      if (this.props.ui.sort) {
+        keys.sort();
+      }
+
+      keys.forEach((key) => {
         ret.push(
           <option
             value={valueToString(this.props.ui.domain[key])}

diff --git a/src/React/Properties/PropertyPanel/index.js b/src/React/Properties/PropertyPanel/index.js
@@ -4,6 +4,10 @@ import PropTypes from 'prop-types';
 import style from 'PVWStyle/ReactProperties/PropertyPanel.mcss';
 import factory from '../PropertyFactory';
 
+function alwaysShow() {
+  return true;
+}
+
 export default class PropertyPanel extends React.Component {
   constructor(props) {
     super(props);
@@ -27,7 +31,12 @@ export default class PropertyPanel extends React.Component {
         this.props.onChange ? this.valueChange : undefined
       );
     const uiContainer = (property) => (
-      <div key={property.title}>
+      <div
+        key={property.title}
+        style={{
+          display: (property.show || alwaysShow)(viewData) ? 'block' : 'none',
+        }}
+      >
         <div className={style.propertyHeader}>
           <strong>{property.title}</strong>
         </div>