@brightspace-ui/core 2.18.7 → 2.18.8

package/mixins/demo/localize-test.js

@@ -1,7 +1,7 @@
 import { html, LitElement } from 'lit';
-import { LocalizeDynamicMixin } from '../../mixins/localize-dynamic-mixin.js';
+import { LocalizeMixin } from '../../mixins/localize-mixin.js';
 
-class LocalizeTest extends LocalizeDynamicMixin(LitElement) {
+class LocalizeTest extends LocalizeMixin(LitElement) {
 
 	static get properties() {
 		return {
@@ -11,7 +11,7 @@ class LocalizeTest extends LocalizeDynamicMixin(LitElement) {
 		};
 	}
 
-	static get localizeConfig() {
+	static async getLocalizeResources(langs) {
 		const langResources = {
 			'ar': { 'hello': 'مرحبا {name}' },
 			'de': { 'hello': 'Hallo {name}' },
@@ -29,15 +29,17 @@ class LocalizeTest extends LocalizeDynamicMixin(LitElement) {
 			'zh-cn': { 'hello': '你好 {name}' },
 			'zh-tw': { 'hello': '你好 {name}' }
 		};
-		return {
-			importFunc: async lang => {
-				return new Promise((resolve) => {
-					setTimeout(() => {
-						resolve(langResources[lang]);
-					}, 50);
-				});
+
+		for (let i = 0; i < langs.length; i++) {
+			if (langResources[langs[i]]) {
+				return {
+					language: langs[i],
+					resources: langResources[langs[i]]
+				};
 			}
-		};
+		}
+
+		return null;
 	}
 
 	render() {

package/mixins/localize-mixin.js

@@ -163,13 +163,12 @@ export const LocalizeMixin = dedupeMixin(superclass => class extends superclass
 	}
 
 	static _getAllLocalizeResources(possibleLanguages, config = this.localizeConfig) {
-		let resourcesLoadedPromises = [];
+		let resourcesLoadedPromises;
 		const superCtor = Object.getPrototypeOf(this);
-		// get imported terms for each config, head up the chain to get them all
 		if ('_getAllLocalizeResources' in superCtor) {
-			// eslint-disable-next-line no-prototype-builtins
-			const superConfig = superCtor.hasOwnProperty('localizeConfig') && superCtor.localizeConfig.importFunc ? superCtor.localizeConfig : config;
-			resourcesLoadedPromises = superCtor._getAllLocalizeResources(possibleLanguages, superConfig);
+			resourcesLoadedPromises = superCtor._getAllLocalizeResources(possibleLanguages, config);
+		} else {
+			resourcesLoadedPromises = [];
 		}
 		// eslint-disable-next-line no-prototype-builtins
 		if (this.hasOwnProperty('getLocalizeResources') || this.hasOwnProperty('resources')) {

package/mixins/localize-mixin.md

@@ -103,17 +103,6 @@ static get localizeConfig() {
 }
 ```
 
-**Note:** If using `LocalizeCoreElement` or a mixin that utilizes `LocalizeCoreElement` as well as `LocalizeDynamicMixin` or a mixin that uses `LocalizeDynamicMixin`, `LocalizeDynamicMixin` **must** appear before `LocalizeCoreElement` in the chain. For example:
-
-```javascript
-import { LocalizeCoreElement } from '@brightspace-ui/core/helpers/localize-core-element.js';
-import { LocalizeDynamicMixin } from '@brightspace-ui/core/mixins/localize-dynamic-mixin.js';
-
-class MyComponent extends LocalizeDynamicMixin(LocalizeCoreElement(LitElement)) {
-  ...
-}
-```
-
 ## `localize()`
 
 Once your localization resources are available, the `localize()` method is used to localize a piece of text in your `render()` method.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightspace-ui/core",
-  "version": "2.18.7",
+  "version": "2.18.8",
   "description": "A collection of accessible, free, open-source web components for building Brightspace applications",
   "type": "module",
   "repository": "https://github.com/BrightspaceUI/core.git",