enable lookup of text messages outside of the prefixed scope

Author: oliverlaz

src/lib/messageSource.js

@@ -32,7 +32,15 @@ function enhanceWithMessages(keyPrefix, WrappedComponent) {
      * @param key the key of the message.
      * @param params an optional parameters (param0, param1 ...).
      */
-    getMessage = (key, ...params) => getMessageWithParams(this.context, normalizedKeyPrefix + key, ...params);
+    getMessage = (key, ...params) => {
+      const textKey = normalizedKeyPrefix + key;
+      const message = getMessageWithParams(this.context, textKey, ...params);
+      if (message === textKey) {
+        return getMessageWithParams(this.context, key, ...params);
+      }
+
+      return message;
+    };
 
     /**
      * Retrieves a text message with named parameters.
@@ -47,8 +55,15 @@ function enhanceWithMessages(keyPrefix, WrappedComponent) {
      * @param key the key of the message.
      * @param namedParams a map of named parameters.
      */
-    getMessageWithNamedParams = (key, namedParams) =>
-      getMessageWithNamedParams(this.context, normalizedKeyPrefix + key, namedParams);
+    getMessageWithNamedParams = (key, namedParams) => {
+      const textKey = normalizedKeyPrefix + key;
+      const message = getMessageWithNamedParams(this.context, textKey, namedParams)
+      if (message === textKey) {
+        return getMessageWithNamedParams(this.context, key, namedParams);
+      }
+
+      return message;
+    };
 
     render() {
       if (process.env.NODE_ENV !== 'production') {

src/lib/messageSource.test.js

@@ -7,6 +7,7 @@ import * as MessageSource from './messageSource';
 describe('MessageSource', () => {
   const translations = {
     'hello.world': 'Hello World',
+    'greeting.normal': 'Hi',
     'greeting.named': 'Hello {name}',
   };
 
@@ -104,6 +105,32 @@ describe('MessageSource', () => {
     expect(nestedComponentInstance.children[0]).toBe('Hello World');
   });
 
+  it('[curried] retrieves the correct translated value in mixed mode', () => {
+    function Nested(props) {
+      const { getMessage } = props;
+      return (
+        <React.Fragment>
+          {getMessage('world')}
+          {getMessage('greeting.normal')}
+        </React.Fragment>
+      );
+    }
+
+    const NestedHOC = MessageSource.withMessages('hello')(Nested);
+
+    const renderer = TestRenderer.create(
+      <MessageSource.Provider value={translations}>
+        <NestedHOC />
+      </MessageSource.Provider>,
+    );
+
+    const { root } = renderer;
+    const nestedComponentInstance = root.findByType(Nested);
+
+    expect(nestedComponentInstance.children[0]).toBe('Hello World');
+    expect(nestedComponentInstance.children[1]).toBe('Hi');
+  });
+
   it('supports nested overrides', () => {
     const levelOne = {
       'hello.world': 'Hello World',