call onconstruct from init options from constructor - fixes #3267

ractivejs · Sep 27, 2018 · ce7b07e · ce7b07e
1 parent b4e5cde
commit ce7b07e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/Ractive/construct.js b/src/Ractive/construct.js
@@ -11,6 +11,7 @@ import { ATTRIBUTE, BINDING_FLAG, DECORATOR, INTERPOLATOR, TRANSITION } from 'co
 import { assign, create, hasOwn } from 'utils/object';
 import { isArray, isString } from 'utils/is';
 import { compute } from 'src/Ractive/prototype/compute';
+import getRactiveContext from '../shared/getRactiveContext';
 
 const registryNames = [
   'adaptors',
@@ -50,8 +51,8 @@ export default function construct(ractive, options) {
     ractive.use.apply(ractive, options.use.filter(p => p.construct));
   }
 
-  // TODO don't allow `onconstruct` with `new Ractive()`, there's no need for it
   hooks.construct.fire(ractive, options);
+  if (options.onconstruct) options.onconstruct.call(ractive, getRactiveContext(ractive), options);
 
   // Add registries
   let i = registryNames.length;

diff --git a/tests/browser/events/misc.js b/tests/browser/events/misc.js
@@ -418,4 +418,16 @@ export default function() {
       oninit() {}
     });
   });
+
+  test(`instance calls onconstruct for consistency sake (#3267)`, t => {
+    t.expect(1);
+
+    new Ractive({
+      target: fixture,
+      template: 'sure',
+      onconstruct() {
+        t.ok(true);
+      }
+    });
+  });
 }
diff --git a/tests/browser/init/hooks/order.js b/tests/browser/init/hooks/order.js
@@ -201,7 +201,7 @@ export default function() {
   const topDown = ['parent', 'child', 'grandchild'];
   const bottomUp = ['grandchild', 'child', 'parent'];
 
-  testHierarchy('onconstruct', ['child', 'grandchild']);
+  testHierarchy('onconstruct', topDown);
   testHierarchy('onconfig', topDown);
   testHierarchy('oninit', topDown);
   testHierarchy('onrender', topDown);