@luomus/laji-form 15.1.15 → 15.1.17

package/lib/components/components.d.ts

@@ -88,11 +88,9 @@ export class OverlayTrigger extends React.Component<any, any, any> {
     static contextType: React.Context<import("../ReactContext").ContextProps>;
     constructor(props: any);
     overlayTriggerMouseOver: () => void;
-    overlayTriggerMouseIn: boolean | undefined;
     overlayTriggerMouseOut: () => void;
     overlayTimeout: any;
     overlayMouseOver: () => void;
-    overlayMouseIn: boolean | undefined;
     overlayMouseOut: () => void;
 }
 export class Fullscreen extends React.Component<any, any, any> {

package/lib/components/components.js

@@ -473,35 +473,25 @@ class OverlayTrigger extends React.Component {
     constructor(props) {
         super(props);
         this.overlayTriggerMouseOver = () => {
-            this.overlayTriggerMouseIn = true;
-            this.setState({ show: true });
+            this.setState({ hoveringElem: true });
         };
         this.overlayTriggerMouseOut = () => {
-            this.overlayTriggerMouseIn = false;
             if (this.overlayTimeout) {
                 clearTimeout(this.overlayTimeout);
             }
             this.overlayTimeout = this.props.formContext.setTimeout(() => {
                 if (!this.popoverMouseIn && !this.overlayTriggerMouseIn) {
-                    this.setState({ show: false });
+                    this.setState({ hoveringElem: false });
                 }
             }, 200);
         };
         this.overlayMouseOver = () => {
-            this.overlayMouseIn = true;
+            this.setState({ hoveringOverlay: true });
         };
         this.overlayMouseOut = () => {
-            this.overlayMouseIn = false;
-            if (this.overlayTimeout) {
-                clearTimeout(this.overlayTimeout);
-            }
-            this.overlayTimeout = this.props.formContext.setTimeout(() => {
-                if (!this.overlayMouseIn && !this.overlayTriggerMouseIn) {
-                    this.setState({ show: false });
-                }
-            }, 200);
+            this.setState({ hoveringOverlay: false, hoveringElem: false });
         };
-        this.state = { show: false };
+        this.state = {};
     }
     componentWillUnmount() {
         if (this.overlayTimeout) {
@@ -515,8 +505,9 @@ class OverlayTrigger extends React.Component {
         if (!this.props.hoverable)
             return (React.createElement(OverlayTrigger, Object.assign({}, props, { overlay: overlay }), children));
         let _overlay = React.cloneElement(overlay, { onMouseOver: this.overlayMouseOver, onMouseOut: this.overlayMouseOut });
+        const show = this.state.hoveringElem || this.state.hoveringOverlay;
         return (React.createElement("div", { onMouseOver: this.overlayTriggerMouseOver, onMouseOut: this.overlayTriggerMouseOut },
-            React.createElement(OverlayTrigger, Object.assign({}, props, { delay: 1, trigger: [], placement: this.props.placement || "top", overlay: _overlay, show: this.state.show }), children)));
+            React.createElement(OverlayTrigger, Object.assign({}, props, { delay: 1, trigger: [], placement: this.props.placement || "top", overlay: _overlay, show: show }), children)));
     }
 }
 exports.OverlayTrigger = OverlayTrigger;

package/lib/components/fields/ScopeField.js

@@ -303,7 +303,7 @@ class ScopeField extends React.Component {
             }, this.state.additionalFields);
             if (this._globals) {
                 const additionalsPersistenceVal = this.getAdditionalPersistenceValue(this.props, !"don't include undefined");
-                let globalsEntry = this._globals || {};
+                let globalsEntry = this._globals ? Object.assign({}, this._globals) : {};
                 if (additionalsPersistenceField) {
                     let additionalsKeys = this.props.schema.properties[additionalsPersistenceField].type === "array"
                         ? additionalsPersistenceVal

package/package.json

@@ -1,9 +1,16 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.15",
+  "version": "15.1.17",
   "description": "React module capable of building dynamic forms from Laji form json schemas",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
+  "files": [
+    "lib",
+    "dist",
+    "test-export",
+    "README.md",
+    "CHANGELOG.md"
+  ],
   "scripts": {
     "start": "npx webpack serve",
     "staging": "webpack-dev-server --content-base playground playground/app.js --host 0.0.0.0 --port 4010",

package/protractor.conf.js

@@ -1,59 +0,0 @@
-// Firefox isn't run default since it has a bug with mousemove (See https://github.com/angular/protractor/issues/4715 )
-
-const [width, height] = [800, 1000];
-const common = {
-	shardTestFiles: parseInt(process.env.THREADS) !== 1,
-	maxInstances: process.env.THREADS ? parseInt(process.env.THREADS) :  4
-};
-const chrome = {
-	...common,
-	browserName: "chrome",
-	chromeOptions: {
-		args: ["--headless", "--disable-gpu", `window-size=${width}x${height}`, "--no-sandbox", "--disable-dev-shm-usage"]
-	},
-};
-
-const firefox = {
-	...common,
-	browserName: "firefox",
-	"firefoxOptions": {
-		args: ["--headless", `--width=${width}', '--height=${height}`]
-	},
-	"moz:firefoxOptions": {
-		args: ["--headless", `--width=${width}', '--height=${height}`]
-	}
-};
-
-let multiCapabilities = [chrome];
-if (process.env.TEST_BROWSER === "firefox") {
-	multiCapabilities = [firefox];
-} else if (process.env.TEST_BROWSER === "multi") {
-	multiCapabilities = [chrome, firefox];
-}
-if (process.env.HEADLESS && process.env.HEADLESS !== "true") multiCapabilities.forEach(capabilities => {
-	const options = [capabilities["chromeOptions"], capabilities["firefoxOptions"], capabilities["moz:firefoxOptions"]];
-	options.filter(o => o).forEach(_options => {
-		_options.args = _options.args.filter(a => a !== "--headless");
-	});
-});
-
-exports.config = {
-	specs: ["test/*-spec.ts"],
-	multiCapabilities,
-	maxSessions: 4,
-	SELENIUM_PROMISE_MANAGER: false,
-	onPrepare: async () => {
-		require("ts-node").register({
-			project: require("path").join(__dirname, "./tsconfig.json")
-		});
-
-		browser.waitForAngularEnabled(false);
-
-		// Set manually since Firefox cli size options don't work.
-		await browser.driver.manage().window().setSize(width, height);
-	},
-	plugins: multiCapabilities.length === 1 && multiCapabilities[0] === chrome && [{
-		package: "protractor-console-plugin",
-		exclude: [/Uncaught \(in promise\)/]
-	}]
-};

package/test.Dockerfile

@@ -1,11 +0,0 @@
-FROM mcr.microsoft.com/playwright:v1.40.1
-
-WORKDIR /app
-
-# Copy application files (see .dockerignore for what's excluded)
-COPY . .
-
-# Install dependencies
-RUN npm ci
-
-ENTRYPOINT ["npx", "playwright", "test"]