fix(select): enable hierarchical pre-select

w11k · Jul 18, 2017 · d7866c3 · d7866c3
1 parent 4f643e8
commit d7866c3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/lib/build-internal-options-map.ts b/src/lib/build-internal-options-map.ts
@@ -0,0 +1,11 @@
+export function buildInternalOptionsMap(internalOptions, internalOptionsMap) {
+  internalOptions.forEach((option) => {
+    if (internalOptionsMap[option.trackingId]) {
+      throw new Error('Duplicate hash value for options ' + option.label + ' and ' + internalOptionsMap[option.trackingId].label);
+    }
+    internalOptionsMap[option.trackingId] = option;
+    if (option.children) {
+      buildInternalOptionsMap(option.children, internalOptionsMap);
+    }
+  });
+}
diff --git a/src/w11k-select.directive.ts b/src/w11k-select.directive.ts
@@ -8,6 +8,7 @@ import {InternalOption} from './model/internal-option.model';
 import {OptionState} from './model/option-state.enum';
 import {ConfigInstance} from './model/config.model';
 import {collectActiveLabels} from './lib/collect-active-labels';
+import {buildInternalOptionsMap} from './lib/build-internal-options-map';
 
 
 export interface Scope extends ng.IScope {
@@ -420,15 +421,7 @@ export function w11kSelect(w11kSelectConfig, $parse, $document, w11kSelectHelper
             if (angular.isArray(externalOptions)) {
               internalOptions = externalOptions2internalOptions(externalOptions, viewValue, w11kSelectHelper, optionsExpParsed, scope.config);
               internalOptionsMap = {};
-              let i = internalOptions.length;
-              while (i--) {
-                let option: any = internalOptions[i];
-                if (internalOptionsMap[option.trackingId]) {
-                  throw new Error('Duplicate hash value for options ' + option.label + ' and ' + internalOptionsMap[option.trackingId].label);
-                }
-                internalOptionsMap[option.trackingId] = option;
-              }
-
+              buildInternalOptionsMap(internalOptions,internalOptionsMap);
               filterOptions();
 
               if (ngModelAlreadyRead) {