Don't store the IntlShape in DesignModeCursorDescriptionBuilder

Author: sbates-idrc

src/App.js

@@ -261,7 +261,7 @@ export class App extends React.Component<AppProps, AppState> {
 
         this.characterDescriptionBuilder = new CharacterDescriptionBuilder();
 
-        this.designModeCursorDescriptionBuilder = new DesignModeCursorDescriptionBuilder(this.props.intl);
+        this.designModeCursorDescriptionBuilder = new DesignModeCursorDescriptionBuilder();
 
         this.programChangeController = new ProgramChangeController(this,
             this.props.intl, this.audioManager);

src/CharacterAriaLive.js

@@ -83,7 +83,8 @@ class CharacterAriaLive extends React.Component<CharacterAriaLiveProps, {}> {
             this.props.designModeCursorDescriptionBuilder.buildDescription(
                 this.props.designModeCursorState,
                 this.props.world,
-                this.props.customBackground
+                this.props.customBackground,
+                this.props.intl
             )
         );
     }

src/CharacterAriaLive.test.js

@@ -3,7 +3,7 @@
 import React from 'react';
 import Adapter from 'enzyme-adapter-react-16';
 import { configure, mount } from 'enzyme';
-import { createIntl, IntlProvider } from 'react-intl';
+import { IntlProvider } from 'react-intl';
 import CharacterAriaLive from './CharacterAriaLive';
 import CharacterDescriptionBuilder from './CharacterDescriptionBuilder';
 import CharacterState from './CharacterState';
@@ -16,12 +16,6 @@ import messages from './messages.json';
 
 configure({ adapter: new Adapter() });
 
-const intl = createIntl({
-    locale: 'en',
-    defaultLocale: 'en',
-    messages: messages.en
-});
-
 beforeEach(() => {
     const liveRegionDiv = document.createElement('div');
     liveRegionDiv.setAttribute('id', 'someAriaLiveRegionId');
@@ -46,7 +40,7 @@ const defaultCharacterAriaLiveProps = {
     customBackground: emptyCustomBackground,
     customBackgroundDesignMode: false,
     characterDescriptionBuilder: new CharacterDescriptionBuilder(),
-    designModeCursorDescriptionBuilder: new DesignModeCursorDescriptionBuilder(intl),
+    designModeCursorDescriptionBuilder: new DesignModeCursorDescriptionBuilder(),
     message: null
 };
 

src/DesignModeCursorDescriptionBuilder.js

@@ -7,14 +7,9 @@ import { getBackgroundSquareDescription } from './Utils';
 import type { WorldName } from './Worlds';
 
 export default class DesignModeCursorDescriptionBuilder {
-    intl: IntlShape;
-
-    constructor(intl: IntlShape) {
-        this.intl = intl;
-    }
-
     buildDescription(designModeCursorState: DesignModeCursorState,
-        world: WorldName, customBackground: CustomBackground): string {
+        world: WorldName, customBackground: CustomBackground,
+        intl: IntlShape): string {
 
         const columnLabel = designModeCursorState.getColumnLabel();
         const rowLabel = designModeCursorState.getRowLabel();
@@ -25,11 +20,11 @@ export default class DesignModeCursorDescriptionBuilder {
             designModeCursorState.sceneDimensions,
             world,
             customBackground,
-            this.intl
+            intl
         );
 
         if (itemLabel) {
-            return this.intl.formatMessage(
+            return intl.formatMessage(
                 {
                     id:'DesignModeCursorDescriptionBuilder.positionAndItem'
                 },
@@ -40,7 +35,7 @@ export default class DesignModeCursorDescriptionBuilder {
                 }
             );
         } else {
-            return this.intl.formatMessage(
+            return intl.formatMessage(
                 {
                     id:'DesignModeCursorDescriptionBuilder.position'
                 },

src/DesignModeCursorDescriptionBuilder.test.js

@@ -17,42 +17,46 @@ const sceneDimensions = new SceneDimensions(1, 12, 1, 8);
 const emptyCustomBackground = new CustomBackground(sceneDimensions);
 
 test('Space, background description: no, custom background tile: no', () => {
-    const builder = new DesignModeCursorDescriptionBuilder(intl);
+    const builder = new DesignModeCursorDescriptionBuilder();
     expect(builder.buildDescription(
         new DesignModeCursorState(3, 2, sceneDimensions),
         'Space',
-        emptyCustomBackground
+        emptyCustomBackground,
+        intl
     )).toBe('At C 2');
 });
 
 test('Space, background description: no, custom background tile: yes', () => {
-    const builder = new DesignModeCursorDescriptionBuilder(intl);
+    const builder = new DesignModeCursorDescriptionBuilder();
     expect(builder.buildDescription(
         new DesignModeCursorState(3, 2, sceneDimensions),
         'Space',
         new CustomBackground(sceneDimensions, [
             '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0',
             '0', '0', '1'
-        ])
+        ]),
+        intl
     )).toBe('At C 2 on wall');
 });
 
 test('Space, background description: yes, custom background tile: no', () => {
-    const builder = new DesignModeCursorDescriptionBuilder(intl);
+    const builder = new DesignModeCursorDescriptionBuilder();
     expect(builder.buildDescription(
         new DesignModeCursorState(3, 1, sceneDimensions),
         'Space',
-        emptyCustomBackground
+        emptyCustomBackground,
+        intl
     )).toBe('At C 1 on the Moon');
 });
 
 test('Space, background description: yes, custom background tile: yes', () => {
-    const builder = new DesignModeCursorDescriptionBuilder(intl);
+    const builder = new DesignModeCursorDescriptionBuilder();
     expect(builder.buildDescription(
         new DesignModeCursorState(3, 1, sceneDimensions),
         'Space',
         new CustomBackground(sceneDimensions, [
             '0', '0', '1'
-        ])
+        ]),
+        intl
     )).toBe('At C 1 on wall');
 });