From 06eed7a3305eb7693cebd86e662cd3756d45a3fd Mon Sep 17 00:00:00 2001 From: John Dillick Date: Mon, 24 Apr 2023 16:58:06 -1000 Subject: [PATCH 1/2] Latest Core SDK --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index ab76bfd..1431f20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "reactium", - "version": "5.0.0-alpha-2", + "version": "5.0.0-alpha-3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "reactium", - "version": "5.0.0-alpha-2", + "version": "5.0.0-alpha-3", "license": "MIT", "dependencies": { - "@atomic-reactor/reactium-sdk-core": "^1.2.21", + "@atomic-reactor/reactium-sdk-core": "^1.2.22", "@babel/cli": "^7.21.0", "@babel/node": "^7.20.7", "@loadable/component": "^5.15.3", @@ -443,9 +443,9 @@ } }, "node_modules/@atomic-reactor/reactium-sdk-core": { - "version": "1.2.21", - "resolved": "https://registry.npmjs.org/@atomic-reactor/reactium-sdk-core/-/reactium-sdk-core-1.2.21.tgz", - "integrity": "sha512-STBIWFemiVHLtbHP9AmxPeyEAfVIbqw+RysouM1KTCrsuHzmC8YVjNIY7YcsRhYOIOWagx7FmLPnH+5Zpz2+fA==", + "version": "1.2.22", + "resolved": "https://registry.npmjs.org/@atomic-reactor/reactium-sdk-core/-/reactium-sdk-core-1.2.22.tgz", + "integrity": "sha512-w3Ln+yNdifmFOhfgBYMTcCzJxBt6o7rsi/TVP3Hg06FGqf5yU72yoa1r6JhtmZfer50mFMsfVvAW1WPmxjSZFA==", "dependencies": { "action-sequence": "^1.1.2", "classnames": "^2.3.2", diff --git a/package.json b/package.json index cf73254..91b0714 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "parse/node": false }, "dependencies": { - "@atomic-reactor/reactium-sdk-core": "^1.2.21", + "@atomic-reactor/reactium-sdk-core": "^1.2.22", "@babel/cli": "^7.21.0", "@babel/node": "^7.20.7", "@loadable/component": "^5.15.3", From 4b1085658b5509dcd185c5b6b700d1ecac7a2600 Mon Sep 17 00:00:00 2001 From: John Dillick Date: Mon, 24 Apr 2023 19:45:44 -1000 Subject: [PATCH 2/2] Add useDispatcher and useStateEffect hooks --- .core/app/reactium-hooks.js | 2 +- .core/sdk/index.js | 9 ++++++-- .core/sdk/named-exports/index.js | 1 + .core/sdk/named-exports/useDispatcher.js | 28 ++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 .core/sdk/named-exports/useDispatcher.js diff --git a/.core/app/reactium-hooks.js b/.core/app/reactium-hooks.js index a949640..4bd9ff5 100644 --- a/.core/app/reactium-hooks.js +++ b/.core/app/reactium-hooks.js @@ -124,7 +124,7 @@ import('reactium-core/sdk').then( Reactium.Hook.register( 'sdk-init', - async () => { + async Reactium => { Reactium.State = new ReactiumSyncState( op.get(window, 'state', {}), ); diff --git a/.core/sdk/index.js b/.core/sdk/index.js index ba50b7b..ffca452 100644 --- a/.core/sdk/index.js +++ b/.core/sdk/index.js @@ -13,7 +13,7 @@ import { } from '@atomic-reactor/reactium-sdk-core'; import { AppContext } from './named-exports'; - +import { useDispatcherFactory, useStateEffectFactory } from './named-exports'; export * from '@atomic-reactor/reactium-sdk-core'; export * from './named-exports'; @@ -57,4 +57,9 @@ const apiHandler = { }, }; -export default new Proxy(SDK, apiHandler); +const Reactium = new Proxy(SDK, apiHandler); + +export const useDispatcher = useDispatcherFactory(Reactium); +export const useStateEffect = useStateEffectFactory(Reactium); + +export default Reactium; diff --git a/.core/sdk/named-exports/index.js b/.core/sdk/named-exports/index.js index 37d87ef..b8e5801 100644 --- a/.core/sdk/named-exports/index.js +++ b/.core/sdk/named-exports/index.js @@ -6,3 +6,4 @@ export * from './i18n'; export * from './routing'; export * from './hookable-component'; export * from './app-context'; +export * from './useDispatcher'; diff --git a/.core/sdk/named-exports/useDispatcher.js b/.core/sdk/named-exports/useDispatcher.js new file mode 100644 index 0000000..b618f78 --- /dev/null +++ b/.core/sdk/named-exports/useDispatcher.js @@ -0,0 +1,28 @@ +import _ from 'underscore'; +import cc from 'camelcase'; +import op from 'object-path'; +import { + ComponentEvent, + useEventEffect, +} from '@atomic-reactor/reactium-sdk-core'; + +export const useDispatcherFactory = Reactium => ({ props, state }) => ( + type, + obj, +) => { + if (!state) state = Reactium.State; + + obj = _.isObject(obj) ? obj : {}; + + const evt = new ComponentEvent(type, obj); + const cb = op.get(props, cc(`on-${type}`)); + + if (_.isFunction(cb)) state.addEventListener(type, cb); + + state.dispatchEvent(evt); + + if (_.isFunction(cb)) state.removeEventListener(type, cb); +}; + +export const useStateEffectFactory = Reactium => (handlers = {}, deps) => + useEventEffect(Reactium.State, handlers, deps);