feat: merge passing context by default

Merge pull request #204 from nightire/context-merging BREAKING CHANGE: context is now merged instead of replaced
NullVoxPopuli · Jan 9, 2022 · 643a8c6 · 643a8c6
2 parents c75bc1c + 85d4b91
commit 643a8c6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/ember-statechart-component/src/-private/statechart-manager.ts b/ember-statechart-component/src/-private/statechart-manager.ts
@@ -40,7 +40,7 @@ export default class ComponentManager {
       machine = machine.withConfig(named.config as any);
     }
 
-    let context = {};
+    let context = { ...machine.context };
 
     if ('context' in named) {
       Object.assign(context, named.context);

diff --git a/testing/ember-app/tests/tests/integration/usage-test.ts b/testing/ember-app/tests/tests/integration/usage-test.ts
@@ -264,6 +264,27 @@ module('Usage', function (hooks) {
     assert.strictEqual(context.numCalled, 13);
   });
 
+  test('merging passed context by default', async function (assert) {
+    let toggle = createMachine({
+      initial: 'inactive',
+      context: { foo: 'foo' },
+      states: {
+        inactive: { on: { TOGGLE: 'active' } },
+        active: { on: { TOGGLE: 'inactive' } },
+      },
+    });
+
+    this.setProperties({ toggle, context: { bar: 'bar' } });
+
+    await render(hbs`
+      <this.toggle @context={{this.context}} as |state send|>
+        {{state.context.foo}}, {{state.context.bar}}
+      </this.toggle>
+    `);
+
+    assert.dom().containsText('foo, bar');
+  });
+
   test('can pass initial state', async function (assert) {
     let toggle = createMachine({
       initial: 'inactive',