@luomus/laji-form-builder 1.1.0 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -36,30 +36,42 @@ const Context_1 = require("../Context");
36
36
  const utils_1 = require("../../utils");
37
37
  const react_tree_graph_1 = require("react-tree-graph");
38
38
  const utils_2 = require("../../../utils");
39
+ const LABEL_HEIGHT = 18; // Should match the actual height in DOM.
40
+ const LABEL_PADDING = 5;
41
+ const NODES_PADDING = 20;
39
42
  const hierarchyNmpsc = utils_1.nmspc("hierarchy");
40
43
  const getLabel = (form, idToUri) => {
41
- const text = React.createElement("text", null, `${form.id} (${form.name})`);
44
+ const y = LABEL_HEIGHT + LABEL_PADDING;
45
+ const { name = "" } = form;
46
+ let ellipsedName = name.substring(0, 30);
47
+ if (ellipsedName.length < name.length) {
48
+ ellipsedName += "...";
49
+ }
50
+ const text = (React.createElement("g", { id: form.id, className: hierarchyNmpsc("label") },
51
+ React.createElement("text", null, form.id),
52
+ React.createElement("text", { y: y }, ellipsedName),
53
+ React.createElement("title", null, name)));
42
54
  return idToUri
43
55
  ? (React.createElement("a", { href: idToUri(form.id), target: "_blank", rel: "noreferrer noopener" }, text)) : text;
44
56
  };
45
57
  const createNode = (form, idToUri) => ({ name: form.id, label: getLabel(form, idToUri), children: [] });
46
- const formChildToParentToFormsD3Hierarchy = (childToParent, id, forms, idToUri) => {
47
- if (!childToParent[id]) {
48
- return;
49
- }
58
+ const formsToHierarchy = (forms, id, idToUri) => {
59
+ const formsById = utils_2.dictionarifyByKey(forms, "id");
50
60
  let base;
51
61
  const idToNode = {};
52
- Object.keys(childToParent).forEach((iteratedId) => {
53
- const parent = childToParent[iteratedId];
54
- const node = idToNode[iteratedId] || createNode(forms[iteratedId], idToUri);
62
+ forms.forEach(form => {
63
+ const node = idToNode[form.id] || createNode(form, idToUri);
55
64
  if (node.name === id) {
56
65
  node.gProps = { className: "base" };
57
66
  base = node;
58
67
  }
59
- const parentNode = idToNode[parent] || createNode(forms[parent], idToUri);
60
- !parentNode.children.includes(node) && parentNode.children.push(node);
61
- node.parent = parentNode;
62
- idToNode[parent] = parentNode;
68
+ const parentId = form.baseFormID || form.fieldsFormID;
69
+ if (parentId) {
70
+ const parentNode = idToNode[parentId] || createNode(formsById[parentId], idToUri);
71
+ !parentNode.children.includes(node) && parentNode.children.push(node);
72
+ node.parent = parentNode;
73
+ idToNode[parentId] = parentNode;
74
+ }
63
75
  });
64
76
  let iterated = base;
65
77
  while (iterated) {
@@ -73,7 +85,6 @@ const formChildToParentToFormsD3Hierarchy = (childToParent, id, forms, idToUri)
73
85
  return undefined;
74
86
  };
75
87
  const HierarchyButton = ({ master, className }) => {
76
- // undefined for loading, null for loaded but nonexistent
77
88
  const [hierarchy, setHierarchy] = React.useState(undefined);
78
89
  const [modalOpen, openModal, closeModal] = utils_1.useBooleanSetter(false);
79
90
  const { formService, lang, translations, theme, idToUri } = React.useContext(Context_1.Context);
@@ -88,17 +99,7 @@ const HierarchyButton = ({ master, className }) => {
88
99
  if (utils_1.isSignalAbortError(forms)) {
89
100
  return;
90
101
  }
91
- const childToparent = forms.reduce((childToParent, form) => {
92
- const parent = form.fieldsFormID || form.baseFormID;
93
- if (parent) {
94
- childToParent[form.id] = parent;
95
- }
96
- return childToParent;
97
- }, {});
98
- if (!childToparent[master.id]) {
99
- setHierarchy(null);
100
- }
101
- const hierarchy = formChildToParentToFormsD3Hierarchy(childToparent, master.id, utils_2.dictionarifyByKey(forms, "id"), idToUri);
102
+ const hierarchy = formsToHierarchy(forms, master.id, idToUri);
102
103
  setHierarchy(hierarchy);
103
104
  });
104
105
  getHierarchy();
@@ -114,9 +115,8 @@ const HierarchyButton = ({ master, className }) => {
114
115
  modalOpen && React.createElement(HierarchyModal, { hierarchy: hierarchy, onHide: closeModal }));
115
116
  };
116
117
  exports.HierarchyButton = HierarchyButton;
117
- const HierarchyModal = ({ hierarchy, onHide }) => {
118
+ const useComputeMaxWidth = (ref) => {
118
119
  const [maxWidth, setMaxWidth] = React.useState(400);
119
- const ref = React.useRef(null);
120
120
  React.useEffect(() => {
121
121
  if (!ref.current) {
122
122
  return;
@@ -130,14 +130,22 @@ const HierarchyModal = ({ hierarchy, onHide }) => {
130
130
  setMaxWidth(bounds.width);
131
131
  }).observe(ref.current);
132
132
  }, [ref]);
133
- const [depth, setDepth] = React.useState(0);
134
- React.useEffect(() => {
135
- setDepth(getDepth(hierarchy));
136
- }, [hierarchy]);
137
- return (React.createElement(components_1.GenericModal, { onHide: onHide, className: hierarchyNmpsc("modal"), bodyRef: ref },
138
- React.createElement(react_tree_graph_1.Tree, { data: hierarchy, labelProp: "label", height: 300, width: Math.min(depth * 200, maxWidth) })));
133
+ return maxWidth;
134
+ };
135
+ const HierarchyModal = ({ hierarchy, onHide }) => {
136
+ const { translations } = React.useContext(Context_1.Context);
137
+ const ref = React.useRef(null);
138
+ const maxWidth = useComputeMaxWidth(ref);
139
+ const depth = getDepth(hierarchy);
140
+ const maxChildren = getMaxChildren(hierarchy);
141
+ const height = maxChildren * (LABEL_HEIGHT * 2 + LABEL_PADDING + NODES_PADDING);
142
+ return (React.createElement(components_1.GenericModal, { onHide: onHide, className: hierarchyNmpsc("modal"), bodyRef: ref, header: translations["editor.hierarchy.title"] },
143
+ React.createElement(react_tree_graph_1.Tree, { data: hierarchy, labelProp: "label", height: height, width: Math.min(depth * 200, maxWidth) })));
139
144
  };
140
145
  const getDepth = (node) => {
141
146
  return 1 + Math.max(...node.children.map(getDepth), 0);
142
147
  };
148
+ const getMaxChildren = (node) => {
149
+ return Math.max(node.children.reduce((sum, c) => sum + getMaxChildren(c), 0), 1);
150
+ };
143
151
  //# sourceMappingURL=Hierarchy.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Hierarchy.js","sourceRoot":"","sources":["../../../../src/client/components/Editor/Hierarchy.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAE/B,wCAAkD;AAClD,8CAAyE;AACzE,wCAAqC;AACrC,uCAAoG;AACpG,uDAAiE;AACjE,0CAAmD;AAUnD,MAAM,cAAc,GAAG,aAAK,CAAC,WAAW,CAAC,CAAC;AAE1C,MAAM,QAAQ,GAAG,CAAC,IAAiB,EAAE,OAAiC,EAAE,EAAE;IACzE,MAAM,IAAI,GAAG,kCAAO,GAAG,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,GAAG,CAAQ,CAAC;IACxD,OAAO,OAAO;QACb,CAAC,CAAC,CACD,2BAAG,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,MAAM,EAAC,QAAQ,EAAC,GAAG,EAAC,qBAAqB,IAClE,IAAI,CACF,CACJ,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,IAAiB,EAAE,OAAiC,EAAE,EAAE,CAC3E,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;AAEnE,MAAM,mCAAmC,GAAG,CAC3C,aAAgC,EAChC,EAAU,EACV,KAAkC,EAClC,OAAiC,EAChC,EAAE;IACH,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE;QACvB,OAAO;KACP;IACD,IAAI,IAAe,CAAC;IAEpB,MAAM,QAAQ,GAA8B,EAAE,CAAC;IAC/C,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,UAAkB,EAAE,EAAE;QACzD,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;QACzC,MAAM,IAAI,GAAc,QAAQ,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;QACvF,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,EAAE;YACrB,IAAI,CAAC,MAAM,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;YACpC,IAAI,GAAG,IAAI,CAAC;SACZ;QACD,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;QAC1E,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEtE,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC;QAEzB,QAAQ,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,IAAI,QAAQ,GAAG,IAAK,CAAC;IACrB,OAAO,QAAQ,EAAE;QAChB,IAAI,QAAQ,CAAC,MAAM,EAAE;YACpB,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC;SAC3B;aAAM;YACN,OAAO,QAAQ,CAAC;SAChB;KACD;IACD,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,EAA+C,EAAE,EAAE;IACrG,yDAAyD;IACzD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC,QAAQ,CAA+B,SAAS,CAAC,CAAC;IAC1F,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,GAAG,wBAAgB,CAAC,KAAK,CAAC,CAAC;IAEnE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAO,CAAC,CAAC;IACtF,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAE5B,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,EAAmB,CAAC;IAEjD,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACpB,MAAM,YAAY,GAAG,GAAS,EAAE;YAC/B,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;gBAC9C,OAAO;aACP;YAED,MAAM,KAAK,GAAG,MAAM,oBAAY,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;YACzF,IAAI,0BAAkB,CAAC,KAAK,CAAC,EAAE;gBAC9B,OAAO;aACP;YACD,MAAM,aAAa,GAAsB,KAAK,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE;gBAC7E,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,UAAU,CAAC;gBACpD,IAAI,MAAM,EAAE;oBACX,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;iBAChC;gBACD,OAAO,aAAa,CAAC;YACtB,CAAC,EAAE,EAAuB,CAAC,CAAC;YAC5B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;gBAC9B,YAAY,CAAC,IAAI,CAAC,CAAC;aACnB;YACD,MAAM,SAAS,GAAG,mCAAmC,CACpD,aAAa,EAAE,MAAM,CAAC,EAAE,EAAE,yBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,OAAO,CACjE,CAAC;YACF,YAAY,CAAC,SAAS,CAAC,CAAC;QACzB,CAAC,CAAA,CAAC;QACF,YAAY,EAAE,CAAC;IAChB,CAAC,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAEzC,IAAI,CAAC,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAO,CAAC,MAAM,CAAC,IAAK,CAAC,MAAM,CAAC,EAAE,EAAE;QAC7D,OAAO,IAAI,CAAC;KACZ;IAED,MAAM,YAAY,GAAG,kBAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;IACrE,OAAO;QACN,oBAAC,oBAAO,IAAC,OAAO,EAAE,YAAY,CAAC,uBAAuB,CAAC,EAAE,EAAE,EAAC,gBAAgB;YAC3E,oBAAC,mBAAM,IAAC,KAAK,QAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,KAAK,SAAS;gBAC3F,oBAAC,SAAS,IAAC,KAAK,EAAC,UAAU,GAAG,CACtB,CACA;QACR,SAAS,IAAI,oBAAC,cAAc,IAAC,SAAS,EAAE,SAAU,EAAE,MAAM,EAAE,UAAU,GAAI,CAC1E,CAAC;AACL,CAAC,CAAC;AAnDW,QAAA,eAAe,mBAmD1B;AAEF,MAAM,cAAc,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,EAAgD,EAAE,EAAE;IAC9F,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAiB,IAAI,CAAC,CAAC;IAC/C,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACpB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;YACjB,OAAO;SACP;QACD,IAAI,cAAc,CAAC,GAAG,EAAE;;YACvB,MAAM,MAAM,GAAG,MAAA,GAAG,CAAC,OAAO,0CAAE,qBAAqB,EAAE,CAAC;YACpD,IAAI,CAAC,MAAM,EAAE;gBACZ,OAAO;aACP;YACD,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACV,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC5C,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACpB,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;IAC/B,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAChB,OAAO,CACN,oBAAC,yBAAY,IAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,GAAG;QAC7E,oBAAC,uBAAI,IAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAC,OAAO,EAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,GAAG,EAAE,QAAQ,CAAC,GAAG,CACjF,CACf,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,IAAe,EAAU,EAAE;IAC5C,OAAO,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;AACxD,CAAC,CAAC"}
1
+ {"version":3,"file":"Hierarchy.js","sourceRoot":"","sources":["../../../../src/client/components/Editor/Hierarchy.tsx"],"names":[],"mappings":"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"}
@@ -323,5 +323,8 @@
323
323
  .ljb-hierarchy-modal .base text {
324
324
  stroke: #555555;
325
325
  }
326
+ .ljb-hierarchy-modal .ljb-hierarchy-label {
327
+ display: flex;
328
+ }
326
329
 
327
330
  /*# sourceMappingURL=styles.css.map */
@@ -1 +1 @@
1
- {"version":3,"sourceRoot":"","sources":["../../src/client/styles.scss"],"names":[],"mappings":";AAoFA;EACC,SALS;;;AAoBV;EAIC;;AAEA;EAEC,cA5BQ;;AA8BR;EACC,OAvGS;EAwGT;EACA;;AAGD;EACC,OApHS;;AAsHV;EACC;;AAED;EACC,OAnHS;EAoHT;;AAED;EACC,OA9HS;;AAgIV;EACC;;AAED;EACC;;AAED;EACC;;AAEA;EACC;EACA;EACA,OA/HO;;AAiIR;EACC,OArIK;;AAwIP;EACC;;AAEA;EACC;EACA;EACA,OArHQ;;AAuHT;EACC,OA3HM;;AA8HR;EACC;;AAEA;EACC,OA1GO;EA2GP;;AAGF;EACC;EACA;EACA;;AAIF;EACC;;AAGD;EACC;EA1FD,kBAzFS;;AA0FT;EACC;;AA4FA;EACC;EACA;EACA;;AAED;EACC,kBAjLQ;EAkLR,cA7KQ;EA8KR,OA9KQ;;AAgLT;EACC,kBA3KS;EA4KT,cAtKS;EAuKT,OAvKS;;AA0KX;EACC,SAxHQ;EAyHR,kBA7JK;;AA+JN;EACC,OApJO;;AAuJR;EACC;;AAGD;EACC,SApIQ;;AAsIR;EACC,cAvIO;;AA4IT;EACC;;AAGD;EACC,kBA3NU;EA4NV;EACA;;AAEA;EACC;;AACA;EACC;EACA;;AAGF;EACC;;AAGD;EACC,OArMI;;AAyMN;EACE,OA1MI;;AA4MN;EACC;;AAEA;EACC;EACA;EACA,OAzMM;;AA4MP;EACC;;AAKD;EACC;EACA;EACA;EACA;;AACA;EACC;EACA;;AAKH;EACC;;AAID;EAxLA;EACA;;AA0LC;EACC,kBA/QQ;;AAmRV;EACC;EACA;EACA;EACA;;AAEA;EACC;EACA,OAhPM;;AAqPP;EACC,OAlQI;EAmQJ,kBAzSS;EA0ST;;AAGD;EACC;;AAGD;EACC;;AAED;EACC,SA3OO;;AAiPR;EACC;EACA;EACA,eAnPO;EAoPP,OA1TM;EA2TN;EACA;EACA;EACA;;AACA;EACC;EACA;;AAKH;EACC,YA1RO;EA2RP;;AAGD;EACE,eAvQO;;AA2QR;EACC;EACA;;AAGC;EACC,OAtVI;EAuVJ;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC,OA1VK;EA2VL,YAjWK;;AAqWP;EACC;EACA;EACA;;AAMJ;EAjSA,kBAzFS;;AA0FT;EACC;;AAmSD;EACC;;AAGD;EAlSA;EACA;;AAoSC;EACC,kBA1XQ;;AA4XT;EACC,kBAhVQ;;AAkVT;EACC,kBA1WS;;AA8WX;EACC;EACA;;AAID;EACC;;AACA;EACC;EACA;EACA;;AAKD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAKD;EACC;EACA;;AAED;EACC;;AAED;EACI;;AAEJ;EACC","file":"styles.css"}
1
+ {"version":3,"sourceRoot":"","sources":["../../src/client/styles.scss"],"names":[],"mappings":";AAoFA;EACC,SALS;;;AAoBV;EAIC;;AAEA;EAEC,cA5BQ;;AA8BR;EACC,OAvGS;EAwGT;EACA;;AAGD;EACC,OApHS;;AAsHV;EACC;;AAED;EACC,OAnHS;EAoHT;;AAED;EACC,OA9HS;;AAgIV;EACC;;AAED;EACC;;AAED;EACC;;AAEA;EACC;EACA;EACA,OA/HO;;AAiIR;EACC,OArIK;;AAwIP;EACC;;AAEA;EACC;EACA;EACA,OArHQ;;AAuHT;EACC,OA3HM;;AA8HR;EACC;;AAEA;EACC,OA1GO;EA2GP;;AAGF;EACC;EACA;EACA;;AAIF;EACC;;AAGD;EACC;EA1FD,kBAzFS;;AA0FT;EACC;;AA4FA;EACC;EACA;EACA;;AAED;EACC,kBAjLQ;EAkLR,cA7KQ;EA8KR,OA9KQ;;AAgLT;EACC,kBA3KS;EA4KT,cAtKS;EAuKT,OAvKS;;AA0KX;EACC,SAxHQ;EAyHR,kBA7JK;;AA+JN;EACC,OApJO;;AAuJR;EACC;;AAGD;EACC,SApIQ;;AAsIR;EACC,cAvIO;;AA4IT;EACC;;AAGD;EACC,kBA3NU;EA4NV;EACA;;AAEA;EACC;;AACA;EACC;EACA;;AAGF;EACC;;AAGD;EACC,OArMI;;AAyMN;EACE,OA1MI;;AA4MN;EACC;;AAEA;EACC;EACA;EACA,OAzMM;;AA4MP;EACC;;AAKD;EACC;EACA;EACA;EACA;;AACA;EACC;EACA;;AAKH;EACC;;AAID;EAxLA;EACA;;AA0LC;EACC,kBA/QQ;;AAmRV;EACC;EACA;EACA;EACA;;AAEA;EACC;EACA,OAhPM;;AAqPP;EACC,OAlQI;EAmQJ,kBAzSS;EA0ST;;AAGD;EACC;;AAGD;EACC;;AAED;EACC,SA3OO;;AAiPR;EACC;EACA;EACA,eAnPO;EAoPP,OA1TM;EA2TN;EACA;EACA;EACA;;AACA;EACC;EACA;;AAKH;EACC,YA1RO;EA2RP;;AAGD;EACE,eAvQO;;AA2QR;EACC;EACA;;AAGC;EACC,OAtVI;EAuVJ;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC,OA1VK;EA2VL,YAjWK;;AAqWP;EACC;EACA;EACA;;AAMJ;EAjSA,kBAzFS;;AA0FT;EACC;;AAmSD;EACC;;AAGD;EAlSA;EACA;;AAoSC;EACC,kBA1XQ;;AA4XT;EACC,kBAhVQ;;AAkVT;EACC,kBA1WS;;AA8WX;EACC;EACA;;AAID;EACC;;AACA;EACC;EACA;EACA;;AAKD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAPD;EACC;;AAED;EACC;;AAED;EACC;;AAKD;EACC;EACA;;AAED;EACC;;AAED;EACI;;AAEJ;EACC;;AAED;EACI","file":"styles.css"}
@@ -270,8 +270,13 @@
270
270
  "en": "Open the JSON in a modal for editing"
271
271
  },
272
272
  "editor.hierarchy.help": {
273
- "fi": "Näytä riippuvuuspuu",
274
- "sv": "Näytä riippuvuuspuu",
275
- "en": "Open the hierarchy tree"
273
+ "fi": "Näytä lomakkeiden perintäpuu",
274
+ "sv": "Näytä lomakkeiden perintäpuu",
275
+ "en": "Open the form inheritance tree"
276
+ },
277
+ "editor.hierarchy.title": {
278
+ "fi": "Lomake perii toisen lomakkeen kentällä 'baseFormID' tai 'fieldsFromID'",
279
+ "sv": "Näytä lomakkeiden perintäpuu",
280
+ "en": "Open the form inheritance tree"
276
281
  }
277
282
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luomus/laji-form-builder",
3
- "version": "1.1.0",
3
+ "version": "1.1.1",
4
4
  "description": "UI for building laji.fi forms",
5
5
  "main": "lib/client/app.js",
6
6
  "scripts": {