From 5a15b0af8282cb9c65fe00c57b9f4e72691e2965 Mon Sep 17 00:00:00 2001
From: Tom Dye <github@tomdye.co.uk>
Date: Tue, 3 Oct 2017 15:42:41 +0100
Subject: [PATCH] remove the stacked theme reversal

---
 src/mixins/Themeable.ts        | 2 +-
 tests/unit/mixins/Themeable.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mixins/Themeable.ts b/src/mixins/Themeable.ts
index e7a15386..fad46f9c 100644
--- a/src/mixins/Themeable.ts
+++ b/src/mixins/Themeable.ts
@@ -313,7 +313,7 @@ export function ThemeableMixin<E, T extends Constructor<WidgetBase<ThemeableProp
 		private _recalculateThemeClasses() {
 			const { properties: { injectedTheme = {}, theme = injectedTheme } } = this;
 			if (!this._registeredBaseThemes) {
-				this._registeredBaseThemes = [ ...this.getDecorator('baseThemeClasses') ].reverse();
+				this._registeredBaseThemes = [ ...this.getDecorator('baseThemeClasses') ];
 				this._checkForDuplicates();
 			}
 			const registeredBaseThemeKeys = this._registeredBaseThemes.map((registeredBaseThemeClasses) => {
diff --git a/tests/unit/mixins/Themeable.ts b/tests/unit/mixins/Themeable.ts
index 78a2973a..8f57b166 100644
--- a/tests/unit/mixins/Themeable.ts
+++ b/tests/unit/mixins/Themeable.ts
@@ -40,15 +40,15 @@ class SubClassTestWidget extends TestWidget { }
 @theme(baseThemeClasses2)
 class StackedTestWidget extends ThemeableMixin(WidgetBase)<ThemeableProperties> { }
 
-@theme(baseThemeClasses3)
 @theme(baseThemeClasses1)
+@theme(baseThemeClasses3)
 class DuplicateThemeClassWidget extends ThemeableMixin(WidgetBase)<ThemeableProperties> { }
 
 class NonDecoratorDuplicateThemeClassWidget extends ThemeableMixin(WidgetBase)<ThemeableProperties> {
 	constructor() {
 		super();
-		theme(baseThemeClasses1)(this);
 		theme(baseThemeClasses3)(this);
+		theme(baseThemeClasses1)(this);
 	}
 }