@thx/controls 17.3.1 → 17.3.2

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.
Files changed (62) hide show
  1. package/dist/esm/date/LocalDatePicker/LocalDatePicker.js.map +1 -1
  2. package/dist/esm/date/LocalDatePicker/MaskedDateInput.js.map +1 -1
  3. package/dist/esm/date/LocalMonthSelect/LocalMonthSelect.js.map +1 -1
  4. package/dist/esm/date/LocalTimePicker/MaskedTimeInput.js.map +1 -1
  5. package/dist/esm/date/MonthDayPicker/MonthDayPicker.js.map +1 -1
  6. package/dist/esm/date/MonthYearPicker/MonthYearPicker.js.map +1 -1
  7. package/dist/esm/date/YearSelect/YearSelect.js.map +1 -1
  8. package/dist/esm/form/TForm/TForm.js.map +1 -1
  9. package/dist/esm/form/TForm/useTForm.js.map +1 -1
  10. package/dist/esm/index.js +0 -3
  11. package/dist/esm/index.js.map +1 -1
  12. package/dist/esm/inputs/CreditCardInput/CreditCardInput.js.map +1 -1
  13. package/dist/esm/inputs/CreditCardInput/CreditCardNumberInput.js.map +1 -1
  14. package/dist/esm/inputs/MaskedInput/MaskedInput.js.map +1 -1
  15. package/dist/esm/inputs/PhoneInput/PhoneInput.js.map +1 -1
  16. package/dist/esm/inputs/RadioGroup/RadioGroup.js.map +1 -1
  17. package/dist/esm/inputs/SinInput/SinInput.js.map +1 -1
  18. package/dist/esm/inputs/TableInput/CheckboxEditCell.js.map +1 -1
  19. package/dist/esm/inputs/TableInput/DropdownCell.js +1 -1
  20. package/dist/esm/inputs/TableInput/DropdownCell.js.map +1 -1
  21. package/dist/esm/inputs/TableInput/NumberEditCell.js.map +1 -1
  22. package/dist/esm/inputs/TableInput/StringEditCell.js.map +1 -1
  23. package/dist/esm/inputs/TableInput/TableInput.js.map +1 -1
  24. package/dist/esm/money/MoneyCurrencyInput/MoneyCurrencyInput.js.map +1 -1
  25. package/dist/esm/money/MoneyInput/MoneyInput.js.map +1 -1
  26. package/dist/esm/money/useMoneyInput.js.map +1 -1
  27. package/dist/stats.html +1 -1
  28. package/dist/stats.txt +45 -57
  29. package/dist/types/date/LocalDatePicker/LocalDatePicker.d.ts +1 -1
  30. package/dist/types/date/LocalDatePicker/MaskedDateInput.d.ts +1 -1
  31. package/dist/types/date/LocalMonthSelect/LocalMonthSelect.d.ts +1 -1
  32. package/dist/types/date/LocalTimePicker/MaskedTimeInput.d.ts +1 -1
  33. package/dist/types/date/MonthDayPicker/MonthDayPicker.d.ts +1 -1
  34. package/dist/types/date/MonthYearPicker/MonthYearPicker.d.ts +1 -1
  35. package/dist/types/date/YearSelect/YearSelect.d.ts +1 -1
  36. package/dist/types/form/TForm/TForm.d.ts +1 -1
  37. package/dist/types/form/TForm/useTForm.d.ts +2 -2
  38. package/dist/types/inputs/CreditCardInput/CreditCardInput.d.ts +1 -1
  39. package/dist/types/inputs/CreditCardInput/CreditCardNumberInput.d.ts +1 -1
  40. package/dist/types/inputs/MaskedInput/MaskedInput.d.ts +1 -1
  41. package/dist/types/inputs/PhoneInput/PhoneInput.d.ts +1 -1
  42. package/dist/types/inputs/RadioGroup/RadioGroup.d.ts +1 -1
  43. package/dist/types/inputs/TableInput/CheckboxEditCell.d.ts +1 -1
  44. package/dist/types/inputs/TableInput/NumberEditCell.d.ts +1 -1
  45. package/dist/types/inputs/TableInput/StringEditCell.d.ts +1 -1
  46. package/dist/types/inputs/TableInput/TableInput.d.ts +3 -3
  47. package/dist/types/money/MoneyCurrencyInput/MoneyCurrencyInput.d.ts +1 -1
  48. package/dist/types/money/MoneyInput/MoneyInput.d.ts +2 -2
  49. package/dist/types/money/useMoneyInput.d.ts +1 -1
  50. package/package.json +4 -4
  51. package/dist/esm/inputs/Scriptel/Scriptel.js +0 -52
  52. package/dist/esm/inputs/Scriptel/Scriptel.js.map +0 -1
  53. package/dist/esm/inputs/Scriptel/ScriptelContext.js +0 -6
  54. package/dist/esm/inputs/Scriptel/ScriptelContext.js.map +0 -1
  55. package/dist/esm/inputs/Scriptel/scriptel/enums.js +0 -21
  56. package/dist/esm/inputs/Scriptel/scriptel/enums.js.map +0 -1
  57. package/dist/esm/inputs/Scriptel/scriptel/index.js +0 -93
  58. package/dist/esm/inputs/Scriptel/scriptel/index.js.map +0 -1
  59. package/dist/esm/inputs/Scriptel/withScriptel.js +0 -15
  60. package/dist/esm/inputs/Scriptel/withScriptel.js.map +0 -1
  61. package/dist/esm/inputs/ScriptelInput/ScriptelInput.js +0 -67
  62. package/dist/esm/inputs/ScriptelInput/ScriptelInput.js.map +0 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@thx/controls",
3
- "version": "17.3.1",
3
+ "version": "17.3.2",
4
4
  "description": "A collection of components designed with SemanticUI.",
5
5
  "bugs": {
6
6
  "url": "https://github.com/thr-consulting/thr-addons/issues"
@@ -30,8 +30,8 @@
30
30
  "ts": "thx ts"
31
31
  },
32
32
  "dependencies": {
33
- "@js-joda/core": "^5.1.0",
34
- "@thx/date": "^17.3.1",
33
+ "@js-joda/core": "^5.6.5",
34
+ "@thx/date": "^17.3.2",
35
35
  "@thx/money": "^17.2.1",
36
36
  "@types/inputmask": "^5.0.7",
37
37
  "@types/react-datepicker": "^6.0.1",
@@ -62,5 +62,5 @@
62
62
  "publishConfig": {
63
63
  "access": "public"
64
64
  },
65
- "gitHead": "de24a4ff0e207da492e794dac2a9133f4d29eb44"
65
+ "gitHead": "1a69d88c303df956e42852cf40d20b63084d54d2"
66
66
  }
@@ -1,52 +0,0 @@
1
- import React, { useRef, useState, useEffect, useMemo } from 'react';
2
- import debug from 'debug';
3
- import { ScriptelContext } from './ScriptelContext.js';
4
- import { ScriptelSocket } from './scriptel/index.js';
5
-
6
- debug("thx.controls.inputs.Scriptel");
7
- function Scriptel({ omniscriptUrl, imageType, scale, crop, penStyle, children }) {
8
- const socket = useRef();
9
- const [render, setRender] = useState();
10
- const [loading, setLoading] = useState(false);
11
- const [isSigning, setIsSigning] = useState(false);
12
- useEffect(() => {
13
- socket.current = new ScriptelSocket({
14
- omniscriptUrl,
15
- imageType,
16
- scale,
17
- crop,
18
- penStyle
19
- });
20
- socket.current.on("render", (msg) => {
21
- setRender(msg);
22
- setLoading(false);
23
- setRender(void 0);
24
- });
25
- socket.current.on("okButtonDown", () => {
26
- setLoading(true);
27
- });
28
- socket.current.on("cancel", () => {
29
- setLoading(false);
30
- setRender(void 0);
31
- });
32
- socket.current.on("penMove", () => {
33
- setIsSigning(true);
34
- });
35
- socket.current.on("penUp", () => {
36
- setIsSigning(false);
37
- });
38
- return () => {
39
- if (socket.current)
40
- socket.current.close();
41
- };
42
- }, [omniscriptUrl, imageType, scale, crop, penStyle]);
43
- const scriptel = useMemo(() => {
44
- return { socket, renderImage: render, loading, isSigning };
45
- }, [isSigning, loading, render]);
46
- return /* @__PURE__ */ React.createElement(ScriptelContext.Provider, {
47
- value: scriptel
48
- }, children);
49
- }
50
-
51
- export { Scriptel };
52
- //# sourceMappingURL=Scriptel.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"Scriptel.js","sources":["../../../../src/inputs/Scriptel/Scriptel.tsx"],"sourcesContent":["import debug from 'debug';\nimport {useEffect, useMemo, useRef, useState} from 'react';\nimport {ScriptelContext} from './ScriptelContext';\nimport {ScriptelSocket} from './scriptel';\nimport type {ScriptelPenStyle} from './scriptel/enums';\nimport type {RenderedImage} from './scriptel/messages';\n\nconst d = debug('thx.controls.inputs.Scriptel');\n\nexport interface ScriptelProps {\n\tomniscriptUrl?: string; // Defaults to 'ws://localhost:8080'\n\timageType?: string; // Defaults to 'image/svg+xml'.\n\tscale?: number; // Defaults to 1\n\tcrop?: boolean; // Defaults to false\n\tpenStyle?: ScriptelPenStyle; // Defaults to 'PlainPenStyle'\n\tchildren: JSX.Element | JSX.Element[];\n}\n\nexport function Scriptel({omniscriptUrl, imageType, scale, crop, penStyle, children}: ScriptelProps) {\n\tconst socket = useRef<ScriptelSocket>();\n\tconst [render, setRender] = useState<RenderedImage>();\n\tconst [loading, setLoading] = useState<boolean>(false);\n\tconst [isSigning, setIsSigning] = useState<boolean>(false);\n\n\tuseEffect(() => {\n\t\tsocket.current = new ScriptelSocket({\n\t\t\tomniscriptUrl,\n\t\t\timageType,\n\t\t\tscale,\n\t\t\tcrop,\n\t\t\tpenStyle,\n\t\t});\n\n\t\tsocket.current.on('render', msg => {\n\t\t\tsetRender(msg);\n\t\t\tsetLoading(false);\n\t\t\tsetRender(undefined); // todo look at this in future\n\t\t});\n\t\tsocket.current.on('okButtonDown', () => {\n\t\t\tsetLoading(true);\n\t\t});\n\t\tsocket.current.on('cancel', () => {\n\t\t\tsetLoading(false);\n\t\t\tsetRender(undefined);\n\t\t});\n\t\tsocket.current.on('penMove', () => {\n\t\t\tsetIsSigning(true);\n\t\t});\n\t\tsocket.current.on('penUp', () => {\n\t\t\tsetIsSigning(false);\n\t\t});\n\n\t\treturn () => {\n\t\t\tif (socket.current) socket.current.close();\n\t\t};\n\t}, [omniscriptUrl, imageType, scale, crop, penStyle]);\n\n\tconst scriptel = useMemo(() => {\n\t\treturn {socket, renderImage: render, loading, isSigning};\n\t}, [isSigning, loading, render]);\n\n\treturn <ScriptelContext.Provider value={scriptel}>{children}</ScriptelContext.Provider>;\n}\n"],"names":[],"mappings":";;;;;AAOU,MAAM,8BAA8B,EAAA;AAWvC,SAAA,QAAA,CAAkB,EAAC,aAAe,EAAA,SAAA,EAAW,KAAO,EAAA,IAAA,EAAM,UAAU,QAA0B,EAAA,EAAA;AACpG,EAAA,MAAM,SAAS,MAAuB,EAAA,CAAA;AACtC,EAAM,MAAA,CAAC,MAAQ,EAAA,SAAA,CAAA,GAAa,QAAwB,EAAA,CAAA;AACpD,EAAA,MAAM,CAAC,OAAA,EAAS,UAAc,CAAA,GAAA,QAAA,CAAkB,KAAK,CAAA,CAAA;AACrD,EAAA,MAAM,CAAC,SAAA,EAAW,YAAgB,CAAA,GAAA,QAAA,CAAkB,KAAK,CAAA,CAAA;AAEzD,EAAA,SAAA,CAAU,MAAM;AACf,IAAO,MAAA,CAAA,OAAA,GAAU,IAAI,cAAe,CAAA;AAAA,MACnC,aAAA;AAAA,MACA,SAAA;AAAA,MACA,KAAA;AAAA,MACA,IAAA;AAAA,MACA,QAAA;AAAA,KACA,CAAA,CAAA;AAED,IAAO,MAAA,CAAA,OAAA,CAAQ,EAAG,CAAA,QAAA,EAAU,CAAO,GAAA,KAAA;AAClC,MAAA,SAAA,CAAU,GAAG,CAAA,CAAA;AACb,MAAA,UAAA,CAAW,KAAK,CAAA,CAAA;AAChB,MAAA,SAAA,CAAU,KAAS,CAAA,CAAA,CAAA;AAAA,KACnB,CAAA,CAAA;AACD,IAAO,MAAA,CAAA,OAAA,CAAQ,EAAG,CAAA,cAAA,EAAgB,MAAM;AACvC,MAAA,UAAA,CAAW,IAAI,CAAA,CAAA;AAAA,KACf,CAAA,CAAA;AACD,IAAO,MAAA,CAAA,OAAA,CAAQ,EAAG,CAAA,QAAA,EAAU,MAAM;AACjC,MAAA,UAAA,CAAW,KAAK,CAAA,CAAA;AAChB,MAAA,SAAA,CAAU,KAAS,CAAA,CAAA,CAAA;AAAA,KACnB,CAAA,CAAA;AACD,IAAO,MAAA,CAAA,OAAA,CAAQ,EAAG,CAAA,SAAA,EAAW,MAAM;AAClC,MAAA,YAAA,CAAa,IAAI,CAAA,CAAA;AAAA,KACjB,CAAA,CAAA;AACD,IAAO,MAAA,CAAA,OAAA,CAAQ,EAAG,CAAA,OAAA,EAAS,MAAM;AAChC,MAAA,YAAA,CAAa,KAAK,CAAA,CAAA;AAAA,KAClB,CAAA,CAAA;AAED,IAAA,OAAO,MAAM;AACZ,MAAA,IAAI,MAAO,CAAA,OAAA;AAAS,QAAA,MAAA,CAAO,QAAQ,KAAM,EAAA,CAAA;AAAA,KAC1C,CAAA;AAAA,KACE,CAAC,aAAA,EAAe,WAAW,KAAO,EAAA,IAAA,EAAM,QAAQ,CAAC,CAAA,CAAA;AAEpD,EAAM,MAAA,QAAA,GAAW,QAAQ,MAAM;AAC9B,IAAA,OAAO,EAAC,MAAA,EAAQ,WAAa,EAAA,MAAA,EAAQ,SAAS,SAAS,EAAA,CAAA;AAAA,GACrD,EAAA,CAAC,SAAW,EAAA,OAAA,EAAS,MAAM,CAAC,CAAA,CAAA;AAE/B,EAAO,uBAAA,KAAA,CAAA,aAAA,CAAC,gBAAgB,QAAhB,EAAA;AAAA,IAAyB,KAAO,EAAA,QAAA;AAAA,GAAA,EAAW,QAAS,CAAA,CAAA;AAC7D;;;;"}
@@ -1,6 +0,0 @@
1
- import { createContext } from 'react';
2
-
3
- const ScriptelContext = createContext(void 0);
4
-
5
- export { ScriptelContext };
6
- //# sourceMappingURL=ScriptelContext.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"ScriptelContext.js","sources":["../../../../src/inputs/Scriptel/ScriptelContext.ts"],"sourcesContent":["import {createContext, MutableRefObject} from 'react';\nimport type {ScriptelSocket} from './scriptel';\nimport type {RenderedImage} from './scriptel/messages';\n\nexport const ScriptelContext = createContext<\n\t{socket: MutableRefObject<ScriptelSocket | undefined>; renderImage: RenderedImage | undefined; loading: boolean; isSigning: boolean} | undefined\n>(undefined);\n"],"names":[],"mappings":";;AAIa,MAAA,eAAA,GAAkB,cAE7B,KAAS,CAAA;;;;"}
@@ -1,21 +0,0 @@
1
- var ScriptelPenStyle = /* @__PURE__ */ ((ScriptelPenStyle2) => {
2
- ScriptelPenStyle2["Plain"] = "PlainPenStyle";
3
- ScriptelPenStyle2["Chisel"] = "ChiselPenStyle";
4
- ScriptelPenStyle2["Inkwell"] = "InkwellPenStyle";
5
- return ScriptelPenStyle2;
6
- })(ScriptelPenStyle || {});
7
- var ScriptelMessageClass = /* @__PURE__ */ ((ScriptelMessageClass2) => {
8
- ScriptelMessageClass2["ConnectionOpen"] = "ConnectionOpen";
9
- ScriptelMessageClass2["DeviceOpenRequest"] = "DeviceOpenRequest";
10
- ScriptelMessageClass2["DeviceOpenResponse"] = "DeviceOpenResponse";
11
- ScriptelMessageClass2["RenderedImage"] = "RenderedImage";
12
- ScriptelMessageClass2["ScriptelException"] = "ScriptelException";
13
- ScriptelMessageClass2["ButtonDown"] = "ButtonDown";
14
- ScriptelMessageClass2["ButtonPress"] = "ButtonPress";
15
- ScriptelMessageClass2["PenMove"] = "PenMove";
16
- ScriptelMessageClass2["PenUp"] = "PenUp";
17
- return ScriptelMessageClass2;
18
- })(ScriptelMessageClass || {});
19
-
20
- export { ScriptelMessageClass, ScriptelPenStyle };
21
- //# sourceMappingURL=enums.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"enums.js","sources":["../../../../../src/inputs/Scriptel/scriptel/enums.ts"],"sourcesContent":["export enum ScriptelPenStyle {\n\tPlain = 'PlainPenStyle',\n\tChisel = 'ChiselPenStyle',\n\tInkwell = 'InkwellPenStyle',\n}\n\nexport enum ScriptelMessageClass {\n\tConnectionOpen = 'ConnectionOpen',\n\tDeviceOpenRequest = 'DeviceOpenRequest',\n\tDeviceOpenResponse = 'DeviceOpenResponse',\n\tRenderedImage = 'RenderedImage',\n\tScriptelException = 'ScriptelException',\n\tButtonDown = 'ButtonDown',\n\tButtonPress = 'ButtonPress',\n\tPenMove = 'PenMove',\n\tPenUp = 'PenUp',\n}\n"],"names":[],"mappings":"AAAY,IAAA,gBAAA,qBAAA,iBAAL,KAAA;AACN,EAAQ,iBAAA,CAAA,OAAA,CAAA,GAAA,eAAA,CAAA;AACR,EAAS,iBAAA,CAAA,QAAA,CAAA,GAAA,gBAAA,CAAA;AACT,EAAU,iBAAA,CAAA,SAAA,CAAA,GAAA,iBAAA,CAAA;AAHC,EAAA,OAAA,iBAAA,CAAA;AAAA,CAAA,EAAA,gBAAA,IAAA,EAAA,EAAA;AAMA,IAAA,oBAAA,qBAAA,qBAAL,KAAA;AACN,EAAiB,qBAAA,CAAA,gBAAA,CAAA,GAAA,gBAAA,CAAA;AACjB,EAAoB,qBAAA,CAAA,mBAAA,CAAA,GAAA,mBAAA,CAAA;AACpB,EAAqB,qBAAA,CAAA,oBAAA,CAAA,GAAA,oBAAA,CAAA;AACrB,EAAgB,qBAAA,CAAA,eAAA,CAAA,GAAA,eAAA,CAAA;AAChB,EAAoB,qBAAA,CAAA,mBAAA,CAAA,GAAA,mBAAA,CAAA;AACpB,EAAa,qBAAA,CAAA,YAAA,CAAA,GAAA,YAAA,CAAA;AACb,EAAc,qBAAA,CAAA,aAAA,CAAA,GAAA,aAAA,CAAA;AACd,EAAU,qBAAA,CAAA,SAAA,CAAA,GAAA,SAAA,CAAA;AACV,EAAQ,qBAAA,CAAA,OAAA,CAAA,GAAA,OAAA,CAAA;AATG,EAAA,OAAA,qBAAA,CAAA;AAAA,CAAA,EAAA,oBAAA,IAAA,EAAA;;;;"}
@@ -1,93 +0,0 @@
1
- import debug from 'debug';
2
- import EventEmitter from 'eventemitter3';
3
- import { ScriptelMessageClass, ScriptelPenStyle } from './enums.js';
4
-
5
- const d = debug("thx.controls.inputs.Scriptel.scriptel");
6
- function serverConnected(msg, socket) {
7
- d("Server connected");
8
- if (msg.serverInfo.devices.length > 0) {
9
- const device = msg.serverInfo.devices[0];
10
- socket.send(JSON.stringify({
11
- _class: "DeviceOpenRequest",
12
- uuid: device.uuid
13
- }));
14
- }
15
- }
16
- function deviceConnected(msg, socket, args) {
17
- d(`Device connected: ${msg.device.uuid}`);
18
- const { imageType, scale, crop, penStyle } = args;
19
- socket.send(JSON.stringify({
20
- _class: "RenderSettingsUpdateRequest",
21
- renderSettings: {
22
- _class: "RenderSettings",
23
- type: imageType || "image/svg+xml",
24
- scale: scale || 1,
25
- crop: crop || false,
26
- penStyle: penStyle ? {
27
- renderFunction: penStyle
28
- } : {
29
- renderFunction: ScriptelPenStyle.Plain
30
- }
31
- }
32
- }));
33
- }
34
- function render(msg, args, eventEmitter) {
35
- d(`Rendered image: ${msg.type} ${msg.width}x${msg.height}`);
36
- eventEmitter.emit("render", msg);
37
- }
38
- class ScriptelSocket extends EventEmitter {
39
- constructor(args) {
40
- super();
41
- this.options = args;
42
- this.socket = new WebSocket(args.omniscriptUrl || "ws://localhost:8080");
43
- this.socket.onopen = () => {
44
- d("Socket open");
45
- };
46
- this.socket.onclose = () => {
47
- d("Socket closed");
48
- };
49
- this.socket.onmessage = (ev) => {
50
- const msg = JSON.parse(ev.data);
51
- if (!msg._class)
52
- return;
53
- switch (msg._class) {
54
- case ScriptelMessageClass.ConnectionOpen:
55
- serverConnected(msg, this.socket);
56
- break;
57
- case ScriptelMessageClass.DeviceOpenResponse:
58
- deviceConnected(msg, this.socket, this.options);
59
- break;
60
- case ScriptelMessageClass.RenderedImage:
61
- render(msg, this.options, this);
62
- break;
63
- case ScriptelMessageClass.ScriptelException:
64
- d(`Scriptel Exception Error: ${msg.message}`);
65
- break;
66
- case ScriptelMessageClass.ButtonPress:
67
- if (msg.label === "Cancel")
68
- this.emit("cancel");
69
- break;
70
- case ScriptelMessageClass.ButtonDown:
71
- if (msg.label === "OK")
72
- this.emit("okButtonDown");
73
- break;
74
- case ScriptelMessageClass.PenMove:
75
- this.emit("penMove");
76
- break;
77
- case ScriptelMessageClass.PenUp:
78
- this.emit("penUp");
79
- break;
80
- }
81
- };
82
- }
83
- calibrate() {
84
- d("calibrate");
85
- this.socket.send(JSON.stringify({ _class: "ForceRecalibrate" }));
86
- }
87
- close() {
88
- this.socket.close();
89
- }
90
- }
91
-
92
- export { ScriptelSocket };
93
- //# sourceMappingURL=index.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sources":["../../../../../src/inputs/Scriptel/scriptel/index.ts"],"sourcesContent":["/* globals WebSocket: true */\nimport debug from 'debug';\nimport EventEmitter from 'eventemitter3';\nimport {ScriptelMessageClass, ScriptelPenStyle} from './enums';\nimport type {ConnectionOpen, DeviceOpenResponse, Message, RenderedImage} from './messages';\n\nconst d = debug('thx.controls.inputs.Scriptel.scriptel');\n\nexport interface ScriptelSocketArgs {\n\tomniscriptUrl?: string; // Defaults to 'ws://localhost:8080'\n\timageType?: string; // Defaults to 'image/svg+xml'.\n\tscale?: number; // Defaults to 1\n\tcrop?: boolean; // Defaults to false\n\tpenStyle?: ScriptelPenStyle; // Defaults to 'PlainPenStyle'\n\trender?: () => void;\n}\n\nfunction serverConnected(msg: ConnectionOpen, socket: WebSocket) {\n\td('Server connected');\n\tif (msg.serverInfo.devices.length > 0) {\n\t\t// Grab the first available device\n\t\tconst device = msg.serverInfo.devices[0];\n\t\tsocket.send(\n\t\t\tJSON.stringify({\n\t\t\t\t_class: 'DeviceOpenRequest',\n\t\t\t\tuuid: device.uuid,\n\t\t\t}),\n\t\t);\n\t}\n}\n\nfunction deviceConnected(msg: DeviceOpenResponse, socket: WebSocket, args: ScriptelSocketArgs) {\n\td(`Device connected: ${msg.device.uuid}`);\n\tconst {imageType, scale, crop, penStyle} = args;\n\tsocket.send(\n\t\tJSON.stringify({\n\t\t\t_class: 'RenderSettingsUpdateRequest',\n\t\t\trenderSettings: {\n\t\t\t\t_class: 'RenderSettings',\n\t\t\t\ttype: imageType || 'image/svg+xml',\n\t\t\t\tscale: scale || 1,\n\t\t\t\tcrop: crop || false,\n\t\t\t\tpenStyle: penStyle\n\t\t\t\t\t? {\n\t\t\t\t\t\t\trenderFunction: penStyle,\n\t\t\t\t\t }\n\t\t\t\t\t: {\n\t\t\t\t\t\t\trenderFunction: ScriptelPenStyle.Plain,\n\t\t\t\t\t },\n\t\t\t},\n\t\t}),\n\t);\n}\n\nfunction render(msg: RenderedImage, args: ScriptelSocketArgs, eventEmitter: EventEmitter) {\n\td(`Rendered image: ${msg.type} ${msg.width}x${msg.height}`);\n\teventEmitter.emit('render', msg);\n}\n\nexport class ScriptelSocket extends EventEmitter {\n\tprivate socket: WebSocket;\n\tprivate options: ScriptelSocketArgs;\n\n\tconstructor(args: ScriptelSocketArgs) {\n\t\tsuper();\n\n\t\tthis.options = args;\n\n\t\tthis.socket = new WebSocket(args.omniscriptUrl || 'ws://localhost:8080');\n\n\t\tthis.socket.onopen = () => {\n\t\t\td('Socket open');\n\t\t};\n\n\t\tthis.socket.onclose = () => {\n\t\t\td('Socket closed');\n\t\t};\n\n\t\tthis.socket.onmessage = ev => {\n\t\t\tconst msg = JSON.parse(ev.data) as Message;\n\t\t\tif (!msg._class) return; // A message with no class.\n\n\t\t\tswitch (msg._class) {\n\t\t\t\tcase ScriptelMessageClass.ConnectionOpen:\n\t\t\t\t\tserverConnected(msg, this.socket);\n\t\t\t\t\tbreak;\n\t\t\t\tcase ScriptelMessageClass.DeviceOpenResponse:\n\t\t\t\t\tdeviceConnected(msg, this.socket, this.options);\n\t\t\t\t\tbreak;\n\t\t\t\tcase ScriptelMessageClass.RenderedImage:\n\t\t\t\t\trender(msg, this.options, this);\n\t\t\t\t\tbreak;\n\t\t\t\tcase ScriptelMessageClass.ScriptelException:\n\t\t\t\t\td(`Scriptel Exception Error: ${msg.message}`);\n\t\t\t\t\tbreak;\n\n\t\t\t\tcase ScriptelMessageClass.ButtonPress:\n\t\t\t\t\tif (msg.label === 'Cancel') this.emit('cancel');\n\t\t\t\t\tbreak;\n\t\t\t\tcase ScriptelMessageClass.ButtonDown:\n\t\t\t\t\tif (msg.label === 'OK') this.emit('okButtonDown');\n\t\t\t\t\tbreak;\n\t\t\t\tcase ScriptelMessageClass.PenMove:\n\t\t\t\t\tthis.emit('penMove');\n\t\t\t\t\tbreak;\n\t\t\t\tcase ScriptelMessageClass.PenUp:\n\t\t\t\t\tthis.emit('penUp');\n\t\t\t\t\tbreak;\n\t\t\t\tdefault:\n\t\t\t}\n\t\t};\n\t}\n\n\tcalibrate() {\n\t\td('calibrate');\n\t\tthis.socket.send(JSON.stringify({_class: 'ForceRecalibrate'}));\n\t}\n\n\tclose() {\n\t\tthis.socket.close();\n\t}\n}\n"],"names":[],"mappings":"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"}
@@ -1,15 +0,0 @@
1
- import React from 'react';
2
- import { Scriptel } from './Scriptel.js';
3
-
4
- function withScriptel(WrappedComponent, scriptelProps) {
5
- return function withScriptelHoC(props) {
6
- return /* @__PURE__ */ React.createElement(Scriptel, {
7
- ...scriptelProps
8
- }, /* @__PURE__ */ React.createElement(WrappedComponent, {
9
- ...props
10
- }));
11
- };
12
- }
13
-
14
- export { withScriptel };
15
- //# sourceMappingURL=withScriptel.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"withScriptel.js","sources":["../../../../src/inputs/Scriptel/withScriptel.tsx"],"sourcesContent":["import {Scriptel, ScriptelProps} from './Scriptel';\n\n/**\n * A HoC that provides a connection to a Scriptel Omniscript device.\n * You can only have a single connection open at a time.\n * @param WrappedComponent\n * @return {Object}\n */\nexport function withScriptel(WrappedComponent: any, scriptelProps: ScriptelProps) {\n\treturn function withScriptelHoC(props: any) {\n\t\treturn (\n\t\t\t<Scriptel {...scriptelProps}>\n\t\t\t\t<WrappedComponent {...props} />\n\t\t\t</Scriptel>\n\t\t);\n\t};\n}\n"],"names":[],"mappings":";;;AAQO,SAAA,YAAA,CAAsB,kBAAuB,aAA8B,EAAA;AACjF,EAAA,OAAO,yBAAyB,KAAY,EAAA;AAC3C,IAAA,uBACE,KAAA,CAAA,aAAA,CAAA,QAAA,EAAA;AAAA,MAAa,GAAA,aAAA;AAAA,KAAA,kBACZ,KAAA,CAAA,aAAA,CAAA,gBAAA,EAAA;AAAA,MAAqB,GAAA,KAAA;AAAA,KAAO,CAC9B,CAAA,CAAA;AAAA,GAEF,CAAA;AACD;;;;"}
@@ -1,67 +0,0 @@
1
- import React, { useContext, useState, useEffect } from 'react';
2
- import debug from 'debug';
3
- import { Button, Image } from 'semantic-ui-react';
4
- import { ScriptelContext } from '../Scriptel/ScriptelContext.js';
5
-
6
- debug("thx.controls.inputs.ScriptelInput");
7
- function ScriptelInput(props) {
8
- const { value, onChange, buttonText = "Enter Signature" } = props;
9
- const ctx = useContext(ScriptelContext);
10
- const [enterSignature, setEnterSignature] = useState(false);
11
- useEffect(() => {
12
- if (enterSignature) {
13
- if (onChange && ctx?.renderImage) {
14
- setEnterSignature(false);
15
- if (ctx.renderImage.type === "image/svg+xml" || ctx.renderImage.type === "image/png") {
16
- onChange({
17
- type: ctx.renderImage.type,
18
- width: ctx.renderImage.width,
19
- height: ctx.renderImage.height,
20
- timestamp: new Date(),
21
- data: ctx.renderImage.data
22
- });
23
- }
24
- }
25
- if (onChange && !ctx) {
26
- onChange();
27
- }
28
- }
29
- }, [ctx]);
30
- if (enterSignature) {
31
- return /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement("div", null, ctx?.isSigning ? "signing..." : "Enter a signature and click OK."), /* @__PURE__ */ React.createElement(Button, {
32
- onClick: () => {
33
- setEnterSignature(false);
34
- },
35
- color: "black",
36
- loading: ctx?.loading,
37
- disabled: ctx?.loading
38
- }, "Cancel"), /* @__PURE__ */ React.createElement(Button, {
39
- size: "mini",
40
- as: "a",
41
- basic: true,
42
- onClick: () => ctx?.socket.current?.calibrate(),
43
- disabled: ctx?.loading
44
- }, "Calibrate"));
45
- }
46
- if (value && value.data) {
47
- return /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement(Image, {
48
- size: "medium",
49
- src: value.data,
50
- bordered: true
51
- }), /* @__PURE__ */ React.createElement(Button, {
52
- size: "mini",
53
- compact: true,
54
- onClick: () => {
55
- setEnterSignature(false);
56
- if (onChange)
57
- onChange();
58
- }
59
- }, "Reset"));
60
- }
61
- return /* @__PURE__ */ React.createElement(Button, {
62
- onClick: () => setEnterSignature(true)
63
- }, buttonText);
64
- }
65
-
66
- export { ScriptelInput };
67
- //# sourceMappingURL=ScriptelInput.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"ScriptelInput.js","sources":["../../../../src/inputs/ScriptelInput/ScriptelInput.tsx"],"sourcesContent":["import type {ScriptelSchemaType} from '@thx/yup-types';\nimport debug from 'debug';\nimport {useContext, useEffect, useState} from 'react';\nimport {Button, Image} from 'semantic-ui-react';\nimport {ScriptelContext} from '../Scriptel/ScriptelContext';\n\nconst d = debug('thx.controls.inputs.ScriptelInput');\n\nexport interface ScriptelInputProps {\n\tvalue?: ScriptelSchemaType;\n\tonChange?: (value?: ScriptelSchemaType) => void;\n\tbuttonText?: string;\n}\n\nexport function ScriptelInput(props: ScriptelInputProps) {\n\tconst {value, onChange, buttonText = 'Enter Signature'} = props;\n\tconst ctx = useContext(ScriptelContext);\n\n\tconst [enterSignature, setEnterSignature] = useState(false);\n\n\tuseEffect(() => {\n\t\tif (enterSignature) {\n\t\t\tif (onChange && ctx?.renderImage) {\n\t\t\t\tsetEnterSignature(false);\n\t\t\t\tif (ctx.renderImage.type === 'image/svg+xml' || ctx.renderImage.type === 'image/png') {\n\t\t\t\t\tonChange({\n\t\t\t\t\t\ttype: ctx.renderImage.type,\n\t\t\t\t\t\twidth: ctx.renderImage.width,\n\t\t\t\t\t\theight: ctx.renderImage.height,\n\t\t\t\t\t\ttimestamp: new Date(),\n\t\t\t\t\t\tdata: ctx.renderImage.data,\n\t\t\t\t\t});\n\t\t\t\t}\n\t\t\t}\n\t\t\tif (onChange && !ctx) {\n\t\t\t\tonChange();\n\t\t\t}\n\t\t}\n\t\t// eslint-disable-next-line react-hooks/exhaustive-deps\n\t}, [ctx]);\n\n\tif (enterSignature) {\n\t\treturn (\n\t\t\t<div>\n\t\t\t\t<div>{ctx?.isSigning ? 'signing...' : 'Enter a signature and click OK.'}</div>\n\t\t\t\t<Button\n\t\t\t\t\tonClick={() => {\n\t\t\t\t\t\tsetEnterSignature(false);\n\t\t\t\t\t}}\n\t\t\t\t\tcolor=\"black\"\n\t\t\t\t\tloading={ctx?.loading}\n\t\t\t\t\tdisabled={ctx?.loading}\n\t\t\t\t>\n\t\t\t\t\tCancel\n\t\t\t\t</Button>\n\t\t\t\t<Button size=\"mini\" as=\"a\" basic onClick={() => ctx?.socket.current?.calibrate()} disabled={ctx?.loading}>\n\t\t\t\t\tCalibrate\n\t\t\t\t</Button>\n\t\t\t</div>\n\t\t);\n\t}\n\n\tif (value && value.data) {\n\t\treturn (\n\t\t\t<div>\n\t\t\t\t<Image size=\"medium\" src={value.data} bordered />\n\t\t\t\t<Button\n\t\t\t\t\tsize=\"mini\"\n\t\t\t\t\tcompact\n\t\t\t\t\tonClick={() => {\n\t\t\t\t\t\tsetEnterSignature(false);\n\t\t\t\t\t\tif (onChange) onChange();\n\t\t\t\t\t}}\n\t\t\t\t>\n\t\t\t\t\tReset\n\t\t\t\t</Button>\n\t\t\t</div>\n\t\t);\n\t}\n\n\treturn <Button onClick={() => setEnterSignature(true)}>{buttonText}</Button>;\n}\n"],"names":[],"mappings":"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"}