@performant-software/semantic-components 0.5.16-beta.9 → 0.5.17-beta.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.
Files changed (7) hide show
  1. package/build/index.js +1 -1
  2. package/build/index.js.map +1 -1
  3. package/package.json +3 -3
  4. package/src/components/LazyDocument.js +1 -1
  5. package/src/components/ReferenceCodeDropdown.js +34 -14
  6. package/types/components/LazyDocument.js.flow +1 -1
  7. package/types/components/ReferenceCodeDropdown.js.flow +34 -14
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@performant-software/semantic-components",
3
- "version": "0.5.16-beta.9",
3
+ "version": "0.5.17-beta.1",
4
4
  "description": "A package of shared components based on the Semantic UI Framework.",
5
5
  "license": "MIT",
6
6
  "main": "./build/index.js",
@@ -12,7 +12,7 @@
12
12
  "build": "webpack --mode production && flow-copy-source -v src types"
13
13
  },
14
14
  "dependencies": {
15
- "@performant-software/shared-components": "^0.5.16-beta.9",
15
+ "@performant-software/shared-components": "^0.5.17-beta.1",
16
16
  "@react-google-maps/api": "^2.8.1",
17
17
  "axios": "^0.26.1",
18
18
  "i18next": "^19.4.4",
@@ -33,7 +33,7 @@
33
33
  "react-dom": ">= 16.13.1 < 18.0.0"
34
34
  },
35
35
  "devDependencies": {
36
- "@performant-software/webpack-config": "^0.5.16-beta.9",
36
+ "@performant-software/webpack-config": "^0.5.17-beta.1",
37
37
  "flow-copy-source": "^2.0.9",
38
38
  "less": "^4.1.2",
39
39
  "less-loader": "^11.0.0",
package/src/components/LazyDocument.js CHANGED
@@ -84,7 +84,7 @@ const LazyDocument = (props: Props) => {
84
84
  size={props.size}
85
85
  />
86
86
  )}
87
- { !error && !props.preview && props.src && props.pdf && (
87
+ { !error && loaded && !props.preview && props.src && props.pdf && (
88
88
  <Image
89
89
  {...props.image}
90
90
  size={props.size}
package/src/components/ReferenceCodeDropdown.js CHANGED
@@ -7,8 +7,8 @@ import React, {
7
7
  useMemo,
8
8
  useState
9
9
  } from 'react';
10
- import _ from 'underscore';
11
10
  import { Dropdown } from 'semantic-ui-react';
11
+ import _ from 'underscore';
12
12
 
13
13
  type Item = {
14
14
  reference_table_id: number,
@@ -28,6 +28,14 @@ const ReferenceCodeDropdown = (props: Props) => {
28
28
  const [loading, setLoading] = useState(false);
29
29
  const [options, setOptions] = useState([]);
30
30
 
31
+ /**
32
+ * Sets the "value" variable for the Dropdown component.
33
+ */
34
+ const value = useMemo(() => {
35
+ const v = _.pluck(_.filter(props.value, (x) => !x._destroy), 'reference_code_id');
36
+ return props.multiple ? v : _.first(v);
37
+ }, [props.multiple, props.value]);
38
+
31
39
  /**
32
40
  * Converts the passed ID to a reference code item.
33
41
  *
@@ -53,25 +61,37 @@ const ReferenceCodeDropdown = (props: Props) => {
53
61
  *
54
62
  * @type {(function(*, {value: *}): void)|*}
55
63
  */
56
- const onChange = useCallback((e, { value }) => {
57
- let values;
64
+ const onChange = useCallback((e, data) => {
65
+ let referenceCodeIds;
58
66
 
59
67
  if (props.multiple) {
60
- values = value;
68
+ referenceCodeIds = data.value;
61
69
  } else {
62
- values = _.compact([value]);
70
+ referenceCodeIds = _.compact([data.value]);
63
71
  }
64
72
 
65
- props.onChange(_.map(values, toItem));
66
- }, [toItem, props.multiple, props.onChange]);
73
+ const items = [];
67
74
 
68
- /**
69
- * Sets the "value" variable for the Dropdown component.
70
- */
71
- const value = useMemo(() => {
72
- const v = _.pluck(_.filter(props.value, (x) => !x._destroy), 'reference_code_id');
73
- return props.multiple ? v : _.first(v);
74
- }, [props.multiple, props.value]);
75
+ // Find existing records or create new records
76
+ _.each(referenceCodeIds, (referenceCodeId) => {
77
+ let newValue = _.findWhere(props.value, { reference_code_id: referenceCodeId });
78
+
79
+ if (!newValue) {
80
+ newValue = toItem(referenceCodeId);
81
+ }
82
+
83
+ items.push(_.omit(newValue, '_destroy'));
84
+ });
85
+
86
+ // Mark records for delete
87
+ _.each(props.value, (v) => {
88
+ if (v.id && !_.contains(referenceCodeIds, v.reference_code_id)) {
89
+ items.push({ ...v, _destroy: true });
90
+ }
91
+ });
92
+
93
+ props.onChange(items);
94
+ }, [toItem, props.multiple, props.onChange, props.value]);
75
95
 
76
96
  /**
77
97
  * Loads the list of reference codes from the server.
package/types/components/LazyDocument.js.flow CHANGED
@@ -84,7 +84,7 @@ const LazyDocument = (props: Props) => {
84
84
  size={props.size}
85
85
  />
86
86
  )}
87
- { !error && !props.preview && props.src && props.pdf && (
87
+ { !error && loaded && !props.preview && props.src && props.pdf && (
88
88
  <Image
89
89
  {...props.image}
90
90
  size={props.size}
package/types/components/ReferenceCodeDropdown.js.flow CHANGED
@@ -7,8 +7,8 @@ import React, {
7
7
  useMemo,
8
8
  useState
9
9
  } from 'react';
10
- import _ from 'underscore';
11
10
  import { Dropdown } from 'semantic-ui-react';
11
+ import _ from 'underscore';
12
12
 
13
13
  type Item = {
14
14
  reference_table_id: number,
@@ -28,6 +28,14 @@ const ReferenceCodeDropdown = (props: Props) => {
28
28
  const [loading, setLoading] = useState(false);
29
29
  const [options, setOptions] = useState([]);
30
30
 
31
+ /**
32
+ * Sets the "value" variable for the Dropdown component.
33
+ */
34
+ const value = useMemo(() => {
35
+ const v = _.pluck(_.filter(props.value, (x) => !x._destroy), 'reference_code_id');
36
+ return props.multiple ? v : _.first(v);
37
+ }, [props.multiple, props.value]);
38
+
31
39
  /**
32
40
  * Converts the passed ID to a reference code item.
33
41
  *
@@ -53,25 +61,37 @@ const ReferenceCodeDropdown = (props: Props) => {
53
61
  *
54
62
  * @type {(function(*, {value: *}): void)|*}
55
63
  */
56
- const onChange = useCallback((e, { value }) => {
57
- let values;
64
+ const onChange = useCallback((e, data) => {
65
+ let referenceCodeIds;
58
66
 
59
67
  if (props.multiple) {
60
- values = value;
68
+ referenceCodeIds = data.value;
61
69
  } else {
62
- values = _.compact([value]);
70
+ referenceCodeIds = _.compact([data.value]);
63
71
  }
64
72
 
65
- props.onChange(_.map(values, toItem));
66
- }, [toItem, props.multiple, props.onChange]);
73
+ const items = [];
67
74
 
68
- /**
69
- * Sets the "value" variable for the Dropdown component.
70
- */
71
- const value = useMemo(() => {
72
- const v = _.pluck(_.filter(props.value, (x) => !x._destroy), 'reference_code_id');
73
- return props.multiple ? v : _.first(v);
74
- }, [props.multiple, props.value]);
75
+ // Find existing records or create new records
76
+ _.each(referenceCodeIds, (referenceCodeId) => {
77
+ let newValue = _.findWhere(props.value, { reference_code_id: referenceCodeId });
78
+
79
+ if (!newValue) {
80
+ newValue = toItem(referenceCodeId);
81
+ }
82
+
83
+ items.push(_.omit(newValue, '_destroy'));
84
+ });
85
+
86
+ // Mark records for delete
87
+ _.each(props.value, (v) => {
88
+ if (v.id && !_.contains(referenceCodeIds, v.reference_code_id)) {
89
+ items.push({ ...v, _destroy: true });
90
+ }
91
+ });
92
+
93
+ props.onChange(items);
94
+ }, [toItem, props.multiple, props.onChange, props.value]);
75
95
 
76
96
  /**
77
97
  * Loads the list of reference codes from the server.