@entryscape/rdforms 10.15.0 → 10.16.0

package/package.json

@@ -8,7 +8,7 @@
     "application profile",
     "linked data"
   ],
-  "version": "10.15.0",
+  "version": "10.16.0",
   "main": "dist/rdforms.node.js",
   "browser": "dist/rdforms.react.js",
   "module": "main.js",
@@ -20,73 +20,69 @@
   },
   "dependencies": {
     "@emotion/react": "^11.14.0",
-    "@emotion/styled": "^11.14.0",
+    "@emotion/styled": "^11.14.1",
     "@entryscape/rdfjson": "2.7.7",
-    "@fortawesome/fontawesome-free": "^5.8.1",
-    "@mui/icons-material": "^7.1.0",
-    "@mui/material": "^7.1.0",
-    "@mui/x-date-pickers": "^5.0.0-beta.7",
-    "@selectize/selectize": "^0.13.5",
-    "arrive": "^2.4.1",
+    "@fortawesome/fontawesome-free": "^5.15.4",
+    "@mui/icons-material": "^7.3.4",
+    "@mui/material": "^7.3.4",
+    "@mui/x-date-pickers": "^5.0.20",
+    "arrive": "^2.5.2",
     "bootstrap": "^4.6.2",
-    "bootstrap-datepicker": "^1.9.0",
-    "bootstrap-material-datetimepicker": "https://bitbucket.org/metasolutions/bootstrap-material-datetimepicker.git#webpack",
-    "bootstrap-material-design": "^4.1.1",
+    "bootstrap-datepicker": "^1.10.1",
+    "bootstrap-material-datetimepicker": "bitbucket:metasolutions/bootstrap-material-datetimepicker#webpack",
+    "bootstrap-material-design": "^4.1.3",
     "circular-dependency-plugin": "^5.2.2",
-    "core-js": "^3.4.0",
-    "ifdef-loader": "^2.1.1",
-    "jquery": "^3.7.0",
-    "jquery-mousewheel": "^3.1.13",
-    "lodash": "^4.17.10",
-    "moment": "^2.22.2",
-    "nls-loader": "https://bitbucket.org/metasolutions/nls-loader#master",
-    "node-fetch": "^2.6.0",
+    "core-js": "^3.46.0",
+    "ifdef-loader": "^2.3.2",
+    "jquery": "^3.7.1",
+    "jquery-mousewheel": "^3.2.2",
+    "lodash-es": "^4.17.21",
+    "moment": "^2.30.1",
+    "nls-loader": "bitbucket:metasolutions/nls-loader#master",
+    "node-fetch": "^2.7.0",
     "popper.js": "^1.16.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "react-hooks-lib": "^0.1.5",
-    "regenerator-runtime": "^0.13.2",
+    "regenerator-runtime": "^0.13.11",
     "select2": "4.0.8",
-    "selectize-bootstrap4-theme": "^2.0.2",
-    "sizzle": "^2.3.3",
+    "sizzle": "^2.3.10",
     "terser-webpack-plugin": "^5.3.14",
-    "whatwg-fetch": "^3.0.0"
+    "whatwg-fetch": "^3.6.20"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.0",
-    "@babel/core": "^7.16.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.16.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/plugin-transform-class-properties": "^7.23.3",
-    "@babel/plugin-transform-modules-commonjs": "^7.16.0",
-    "@babel/plugin-transform-react-jsx": "^7.16.0",
-    "@babel/preset-env": "^7.18.6",
-    "@babel/preset-react": "^7.18.6",
-    "babel-loader": "^8.2.3",
-    "babel-plugin-lodash": "^3.3.4",
+    "@babel/cli": "^7.28.3",
+    "@babel/core": "^7.28.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-transform-class-properties": "^7.27.1",
+    "@babel/plugin-transform-modules-commonjs": "^7.27.1",
+    "@babel/plugin-transform-react-jsx": "^7.27.1",
+    "@babel/preset-env": "^7.28.3",
+    "@babel/preset-react": "^7.27.1",
+    "babel-loader": "^8.4.1",
     "babel-plugin-transform-react-jsx": "^6.24.1",
-    "copy-webpack-plugin": "^9.0.1",
-    "css-loader": "^6.5.1",
-    "eslint": "^8.23.0",
-    "eslint-config-airbnb-base": "^11.1.1",
-    "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-requirejs": "^3.1.1",
-    "html-loader": "^3.0.1",
-    "html-webpack-plugin": "^5.5.0",
+    "copy-webpack-plugin": "^9.1.0",
+    "css-loader": "^6.11.0",
+    "eslint": "^8.57.1",
+    "eslint-config-airbnb-base": "^11.3.2",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-requirejs": "^3.2.0",
+    "html-loader": "^3.1.2",
+    "html-webpack-plugin": "^5.6.4",
     "html-webpack-tags-plugin": "^3.0.2",
     "imports-loader": "^0.8.0",
-    "mini-css-extract-plugin": "^0.4.1",
+    "mini-css-extract-plugin": "^0.4.5",
     "optimize-css-assets-webpack-plugin": "^6.0.1",
-    "parallel-webpack": "^2.6.0",
-    "q": "^1.5.0",
+    "q": "^1.5.1",
     "raw-loader": "^4.0.2",
-    "style-loader": "^3.3.1",
-    "svg-inline-loader": "^0.8.0",
+    "style-loader": "^3.3.4",
+    "svg-inline-loader": "^0.8.2",
     "ttf-loader": "^1.0.2",
-    "webpack": "^5.88.2",
+    "webpack": "^5.102.1",
     "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^5.2.1",
-    "webpack-merge": "^5.8.0",
+    "webpack-dev-server": "^5.2.2",
+    "webpack-merge": "^5.10.0",
     "webpack-node-externals": "^3.0.0"
   },
   "files": [
@@ -100,7 +96,6 @@
     "build:node": "webpack --config webpack.node.js",
     "build:node:dev": "webpack --mode=development --config webpack.node.js",
     "build:samples": "webpack --config webpack.samples.js",
-    "dev:bmd": "webpack serve --config webpack.dev.js",
     "dev:bootstrap": "webpack serve --config webpack.dev.js --env type=bootstrap",
     "dev:jquery": "webpack serve --config webpack.dev.js --env type=jquery",
     "dev:react": "webpack serve --config webpack.dev.js --env type=react",
@@ -118,5 +113,5 @@
       "url": "http://valentinohudhra.com/"
     }
   ],
-  "packageManager": "pnpm@10.15.0+sha512.486ebc259d3e999a4e8691ce03b5cac4a71cbeca39372a9b762cb500cfdf0873e2cb16abe3d951b1ee2cf012503f027b98b6584e4df22524e0c7450d9ec7aa7b"
+  "packageManager": "pnpm@10.21.0+sha512.da3337267e400fdd3d479a6c68079ac6db01d8ca4f67572083e722775a796788a7a9956613749e000fac20d424b594f7a791a5f4e2e13581c5ef947f26968a40"
 }

package/src/template/Item.js

@@ -284,7 +284,7 @@ export default class Item {
 
   /**
    * @return {Object} never available for Text item type.
-   * The property value pairs corresponds to predicate and objects in required tripples.
+   * The property value pairs corresponds to predicate and objects in required triples.
    */
   getConstraints(original) {
     const constr = this.getSource(original).constraints;

package/src/template/ItemStore.js

@@ -13,7 +13,7 @@ const deepMerge = (source1, source2) => {
   }
 
   if (Array.isArray(source1) && Array.isArray(source2)) {
-    return [].concat(origSource[key], extSource[key]);
+    return [].concat(source1, source2);
   }
 
   if (typeof source1 === 'object' && typeof source2 === 'object') {
@@ -111,7 +111,7 @@ export default class ItemStore {
           const child = children[j];
           if (child.id === from || child['@id'] === from) {
             child.id = to;
-            delete child['@id']; // Clean up backward compatability.
+            delete child['@id']; // Clean up backward compatibility.
           }
           if (child.content) {
             renameInGroup(child);

package/src/template/OntologyStore.js

@@ -1,4 +1,4 @@
-import { isEqual } from 'lodash';
+import { isEqual } from 'lodash-es';
 
 export default class OntologyStore {
   /**

package/src/utils.js

@@ -1,5 +1,5 @@
 import moment from 'moment';
-import { cloneDeep } from 'lodash';
+import { cloneDeep } from 'lodash-es';
 import system from './model/system';
 
 const getLocalizedValue = (hash, locale) => {

package/src/view/View.js

@@ -28,6 +28,7 @@ export default class View {
     this.styleCls = params.styleCls || '';
     this.truncateLimit = params.truncateLimit !== undefined ? params.truncateLimit : 10;
     this.truncate = params.truncate !== undefined ? params.truncate : false;
+    this.headingLevel = params.headingLevel || 2;
     if (Array.isArray(params.filterPredicates)) {
       this.filterPredicates =
         params.filterPredicates.reduce((prev, current) => { prev[current] = true; return prev; }, {});

package/src/view/bootstrap/choice.js

@@ -60,7 +60,7 @@ editors.itemtype('choice').choices('none').register((fieldDiv, binding, context)
     // reference to the wrong setValue function later on.
     const setValue = context.setValue;
 
-    const $search = jquery(`<button ${disabledAttr} class="btn btn-primary bmd-btn-fab bmd-btn-fab-sm browseChoices" type="button">`)
+    const $search = jquery(`<button ${disabledAttr} class="btn btn-primary browseChoices" type="button">`)
       .attr('title', context.view.messages.edit_browse)
       .appendTo(fieldDiv);
     if (context.chooser && context.chooser.supportsInlineCreate &&
@@ -111,7 +111,7 @@ editors.itemtype('choice').choices('none').register((fieldDiv, binding, context)
       c.load(() => {
         // If the value can be upgraded into its own entity.
         if (c.upgrade) {
-          const $button = jquery(`<button ${disabledAttr} class="btn btn-default bmd-btn-fab bmd-btn-fab-sm` +
+          const $button = jquery(`<button ${disabledAttr} class="btn btn-default` +
             ' browseChoices" type="button">')
             .attr('title', context.view.messages.edit_upgrade)
             .click(() => {

package/src/view/jquery/labels.js

@@ -12,8 +12,9 @@ renderingContext.renderPresenterLabel = (rowNode, binding, item, context, labelR
     label = '';
   }
 
+  const headingElement = `h${context.view.headingLevel}`;
   const $labelDiv = item.hasStyle('heading') ?
-    jquery('<h2 class="rdformsLabel" tabindex="0">').text(label).appendTo(rowNode) :
+    jquery(`<${headingElement} class="rdformsLabel" tabindex="0">`).text(label).appendTo(rowNode) :
     jquery('<div class="rdformsLabel" tabindex="0">').text(label).appendTo(rowNode);
   if (binding) {
     $labelDiv.attr('id', context.view.createLabelIndex(binding));

package/src/view/jquery/text.js

@@ -1,4 +1,4 @@
-import { escape } from 'lodash';
+import { escape } from 'lodash-es';
 import { getDatePresentation, fromDuration } from '../viewUtils';
 import renderingContext from '../renderingContext';
 import utils from '../../utils';

package/src/view/react/labels.js

@@ -132,8 +132,9 @@ renderingContext.renderPresenterLabel = (rowNode, binding, item, context) => {
   const labelId = binding ? context.view.createLabelIndex(binding) : undefined;
   const rdformsLabel = context.view.popupOnLabel ? 'rdformsLabel' : 'rdformsLabel rdformsNoPopup';
   const role = context.view.popupOnLabel ? 'button' : null;
+  const HeadingElement = `h${context.view.headingLevel}`;
   label = item.hasStyle('heading') ?
-    <h2 tabIndex="0" id={labelId} className="rdformsLabelRow"><span className={rdformsLabel} role={role}>{label}</span></h2> :
+    <HeadingElement tabIndex="0" id={labelId} className="rdformsLabelRow"><span className={rdformsLabel} role={role}>{label}</span></HeadingElement> :
     <span tabIndex="0" id={labelId} className="rdformsLabelRow"><span className={rdformsLabel} role={role}>{label}</span></span>;
   if (context.view.popupOnLabel) {
     rowNode.appendChild(<Fragment key={`${binding ? binding.getHash() : item.getHash()}_label` }><ItemTooltip
@@ -156,7 +157,8 @@ renderingContext.renderEditorLabel = (rowNode, binding, item, context) => {
     }
     const rdformsLabel = context.view.popupOnLabel ? 'rdformsLabel' : 'rdformsLabel rdformsNoPopup';
     const role = context.view.popupOnLabel ? 'button' : null;
-    label = item.hasStyle('heading') ? <h2 tabIndex="0" className={rdformsLabel} role={role}>{label}</h2> :
+    const HeadingElement = `h${context.view.headingLevel}`;
+    label = item.hasStyle('heading') ? <HeadingElement tabIndex="0" className={rdformsLabel} role={role}>{label}</HeadingElement> :
       <span tabIndex="0" className={rdformsLabel} role={role}>{label}</span>;
     if (context.view.popupOnLabel) {
       label = <ItemTooltip item={item} context={context} binding={binding}>{label}</ItemTooltip>;

package/src/view/renderingContext.js

@@ -234,7 +234,7 @@ const renderingContext = {
     const alts = {};
 
     // Detect the various available languages
-    // noLanguage - a binding exists with no lanugage set
+    // noLanguage - a binding exists with no language set
     // best - a binding exists with the current locale
     // close - a binding exists with a language close to the current locale,
     //        e.g. en_US when the locale is en or the opposite
@@ -340,6 +340,7 @@ const groupPresenter = (fieldDiv, binding, context) => {
     popupOnLabel: context.view.popupOnLabel,
     truncate: context.view.truncate,
     truncateLimit: context.view.truncateLimit,
+    headingLevel: context.view.headingLevel,
     includeLevel: context.view.includeLevel, // Copied from groupEditor, was this.includeLevel but that 'this' does not make sense here
   }, fieldDiv);
 };
@@ -361,6 +362,7 @@ const groupEditor = (fieldDiv, binding, context) => {
     showDescription: context.view.showDescription,
     truncate: context.view.truncate,
     truncateLimit: context.view.truncateLimit,
+    headingLevel: context.view.headingLevel,
     includeLevel: context.view.includeLevel,
   }, fieldDiv);
   context.view._subEditors.push(subView);