Refactor ComponentRegistry

src/components/FormManager.jsx

@@ -35,7 +35,7 @@ class FormManager extends React.Component {
 
   _mapQuestion(question, index) {
 
-    let component = ComponentRegistry.mapQuestion(question, index);
+    let component = ComponentRegistry.mapComponent(question, index);
     return React.createElement(component, {
       key: question['@id'],
       question: question,

src/components/Question.jsx

@@ -319,7 +319,7 @@ export default class Question extends React.Component {
     for (let i = 0; i < subQuestions.length; i++) {
 
       let question = subQuestions[i];
-      let component = ComponentRegistry.mapQuestion(question, i);
+      let component = ComponentRegistry.mapComponent(question, i);
 
       let element = React.createElement(component, {
         key: 'sub-question-' + i,

src/components/wizard/Wizard.jsx

@@ -101,7 +101,7 @@ const Wizard = () => {
 
     const step = stepData[currentStep];
 
-    let stepComponent = ComponentRegistry.mapWizardStep(step);
+    let stepComponent = ComponentRegistry.mapComponent(step, currentStep, WizardStep);
     return React.createElement(stepComponent, {
       options: options,
       key: 'step' + currentStep,

src/components/wizard/WizardStep.jsx

@@ -60,7 +60,7 @@ export default class WizardStep extends React.Component {
 
     const categoryClass = Question._getQuestionCategoryClass(this.props.step);
 
-    let questionComponent = ComponentRegistry.mapQuestion(this.props.step, 0);
+    let questionComponent = ComponentRegistry.mapComponent(this.props.step, 0);
     let questionElement = React.createElement(questionComponent, {
       question: this.props.step,
       onChange: this.onChange,
@@ -99,4 +99,4 @@ WizardStep.propTypes = {
   stepIndex: PropTypes.number.isRequired,
   isFirstStep: PropTypes.bool,
   isLastStep: PropTypes.bool
-};
+};

src/util/ComponentRegistry.js

@@ -1,39 +1,25 @@
 import Question from '../components/Question';
-import WizardStep from '../components/wizard/WizardStep';
 
 let components = [];
-let wizardSteps = [];
 
 export default class ComponentRegistry {
 
   static registerComponent(component, mapRule) {
     components.push({ component, mapRule });
   }
 
-  static registerWizardStep(component, mapRule) {
-    wizardSteps.push({ component, mapRule });
-  }
-
-  static mapQuestion(question, index) {
-
+  static mapComponent(question, index, def) {
     for (let { component, mapRule } of components) {
       if (mapRule(question, index)) {
         return component;
       }
     }
 
-    return Question;
-  }
-
-  static mapWizardStep(step) {
-
-    for (let { component, mapRule } of wizardSteps) {
-      if (mapRule(step)) {
-        return component;
-      }
+    if (def !== undefined) {
+      return def;
     }
 
-    return WizardStep;
+    return Question;
   }
 
-}
+}