@rh-support/components 2.1.90 → 2.1.92

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 (3) hide show
  1. package/lib/esm/MarkdownEditor/MarkdownEditor.d.ts.map +1 -1
  2. package/lib/esm/MarkdownEditor/MarkdownEditor.js +28 -12
  3. package/package.json +4 -4
package/lib/esm/MarkdownEditor/MarkdownEditor.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MarkdownEditor.d.ts","sourceRoot":"","sources":["../../../src/MarkdownEditor/MarkdownEditor.tsx"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAE9B,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAwB,MAAM,qBAAqB,CAAC;AAgC7E,OAAO,KAAK,EAAE,EAAE,SAAS,EAA+B,MAAM,OAAO,CAAC;AAKtE,oBAAY,UAAU;IAClB,KAAK,cAAc;IACnB,QAAQ,aAAa;CACxB;AAED,UAAU,kBAAkB;IACxB,yBAAyB,EAAE,OAAO,CAAC;IACnC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;IAClC,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IACnD,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IACnD,gBAAgB,EAAE,CAAC,IAAI,KAAA,KAAK,IAAI,CAAC;IACjC,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;IAChD,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC;IAC/B,eAAe,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,cAAe,SAAQ,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,EAAE,UAAU,GAAG,OAAO,GAAG,KAAK,CAAC;IACtG,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;IACrD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAClD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,yBAAyB,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAClD,iBAAiB,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACnD;AAuBD,iBAAS,cAAc,CAAC,KAAK,EAAE,cAAc,qBAy1B5C;kBAz1BQ,cAAc;;;AA61BvB,OAAO,EAAE,cAAc,EAAE,CAAC"}
1
+ {"version":3,"file":"MarkdownEditor.d.ts","sourceRoot":"","sources":["../../../src/MarkdownEditor/MarkdownEditor.tsx"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAE9B,OAAO,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAwB,MAAM,qBAAqB,CAAC;AAgC7E,OAAO,KAAK,EAAE,EAAE,SAAS,EAA+B,MAAM,OAAO,CAAC;AAKtE,oBAAY,UAAU;IAClB,KAAK,cAAc;IACnB,QAAQ,aAAa;CACxB;AAED,UAAU,kBAAkB;IACxB,yBAAyB,EAAE,OAAO,CAAC;IACnC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;IAClC,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IACnD,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IACnD,gBAAgB,EAAE,CAAC,IAAI,KAAA,KAAK,IAAI,CAAC;IACjC,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;IAChD,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC;IAC/B,eAAe,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,cAAe,SAAQ,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,EAAE,UAAU,GAAG,OAAO,GAAG,KAAK,CAAC;IACtG,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;IACrD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAClD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,yBAAyB,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAClD,iBAAiB,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACnD;AAuBD,iBAAS,cAAc,CAAC,KAAK,EAAE,cAAc,qBA62B5C;kBA72BQ,cAAc;;;AAi3BvB,OAAO,EAAE,cAAc,EAAE,CAAC"}
package/lib/esm/MarkdownEditor/MarkdownEditor.js CHANGED
@@ -54,9 +54,9 @@ const defaultProps = {
54
54
  };
55
55
  function MarkdownEditor(props) {
56
56
  const { t } = useTranslation();
57
- const { hidePreviewText, showPreviewText, mdPlaceholder, plainTextPlaceholder, textAreaClassName, bindTextArea, markedownOptions, allowEmoji, hideHeadingOptions, rows, showMarkdownPlainTextToggle, editorMode, className, charLimit, minCharsForCounter, id, onCommentExceedCharsLimit, fileSelectorProps: { onClipboardPaste, onFileDelete, onFileSelect, isSupportedFile, showFileSelectorInToolbar = false, isUploadingFile = false, filesList = [], attachFileBtn, } } = props, textAreaProps = __rest(props, ["hidePreviewText", "showPreviewText", "mdPlaceholder", "plainTextPlaceholder", "textAreaClassName", "bindTextArea", "markedownOptions", "allowEmoji", "hideHeadingOptions", "rows", "showMarkdownPlainTextToggle", "editorMode", "className", "charLimit", "minCharsForCounter", "id", "onCommentExceedCharsLimit", "fileSelectorProps"]);
57
+ const { hidePreviewText, showPreviewText, mdPlaceholder, plainTextPlaceholder, textAreaClassName, bindTextArea, markedownOptions, allowEmoji, hideHeadingOptions, rows, showMarkdownPlainTextToggle, editorMode, className, charLimit, minCharsForCounter, id, value, onCommentExceedCharsLimit, fileSelectorProps: { onClipboardPaste, onFileDelete, onFileSelect, isSupportedFile, showFileSelectorInToolbar = false, isUploadingFile = false, filesList = [], attachFileBtn, } } = props, textAreaProps = __rest(props, ["hidePreviewText", "showPreviewText", "mdPlaceholder", "plainTextPlaceholder", "textAreaClassName", "bindTextArea", "markedownOptions", "allowEmoji", "hideHeadingOptions", "rows", "showMarkdownPlainTextToggle", "editorMode", "className", "charLimit", "minCharsForCounter", "id", "value", "onCommentExceedCharsLimit", "fileSelectorProps"]);
58
58
  const [isPreview, setIsPreview] = useState(false);
59
- const [mdValue, setMdValue] = useState(props.value);
59
+ const [mdValue, setMdValue] = useState(props.value || '');
60
60
  const previousFileList = usePrevious(filesList);
61
61
  const [isPlainModeEnabled, setIsPlainModeEnabled] = useState(showMarkdownPlainTextToggle && props.editorMode === EditorMode.PLAIN ? true : false);
62
62
  const textareaRef = useRef(null);
@@ -157,16 +157,26 @@ function MarkdownEditor(props) {
157
157
  const mode = isPlainMode ? EditorMode.PLAIN : EditorMode.MARKDOWN;
158
158
  props.onChange(mdValue, mode);
159
159
  };
160
+ // Add this useEffect to properly initialize the mdValue when component mounts
160
161
  useEffect(() => {
161
- if (mdValue !== props.value) {
162
- setMdValue(props.value);
162
+ setMdValue(props.value || '');
163
+ }, [props.value]);
164
+ // Update the existing useEffect to handle both value and editorMode changes
165
+ useEffect(() => {
166
+ if (value !== mdValue) {
167
+ setMdValue(value);
163
168
  }
164
- }, [mdValue, props.value]);
169
+ // eslint-disable-next-line react-hooks/exhaustive-deps
170
+ }, [value]);
165
171
  useEffect(() => {
166
- const isPlainMode = props.editorMode === EditorMode.PLAIN ? true : false;
167
- if (isPlainMode === isPlainModeEnabled)
168
- return;
169
- onModeChange(isPlainMode);
172
+ const isPlainMode = props.editorMode === EditorMode.PLAIN;
173
+ if (isPlainMode !== isPlainModeEnabled) {
174
+ setIsPlainModeEnabled(isPlainMode);
175
+ isPlainModeEnabledRef.current = isPlainMode;
176
+ if (isPlainMode && isPreview) {
177
+ setIsPreview(false);
178
+ }
179
+ }
170
180
  // eslint-disable-next-line react-hooks/exhaustive-deps
171
181
  }, [props.editorMode]);
172
182
  useEffect(() => {
@@ -183,8 +193,8 @@ function MarkdownEditor(props) {
183
193
  }, [mdValue], 500);
184
194
  const onValueChangeLocal = (text) => {
185
195
  const mode = showMarkdownPlainTextToggle && isPlainModeEnabled ? EditorMode.PLAIN : EditorMode.MARKDOWN;
186
- props.onChange(text, mode);
187
196
  setMdValue(text);
197
+ props.onChange(text, mode);
188
198
  };
189
199
  const textChanged = (event) => {
190
200
  let value = event.target.value;
@@ -192,7 +202,12 @@ function MarkdownEditor(props) {
192
202
  value = value.replace(emojiPattern, '').trim();
193
203
  }
194
204
  onValueChangeLocal(value);
195
- charLimit - value.length < 0 ? props.onCommentExceedCharsLimit(true) : props.onCommentExceedCharsLimit(false);
205
+ // Add a null check before calling onCommentExceedCharsLimit
206
+ if (props.onCommentExceedCharsLimit) {
207
+ charLimit - value.length < 0
208
+ ? props.onCommentExceedCharsLimit(true)
209
+ : props.onCommentExceedCharsLimit(false);
210
+ }
196
211
  };
197
212
  const hasSelection = () => {
198
213
  return textareaRef.current.selectionStart !== textareaRef.current.selectionEnd;
@@ -212,11 +227,12 @@ function MarkdownEditor(props) {
212
227
  templateEnd +
213
228
  trailingWhitespace +
214
229
  currentText.substring(posEnd);
215
- onValueChangeLocal(newText);
230
+ // Set the value in the textarea
216
231
  textareaRef.current.value = newText;
217
232
  textareaRef.current.selectionStart = posEnd + templateStart.length + templateEnd.length;
218
233
  textareaRef.current.selectionEnd = textareaRef.current.selectionStart;
219
234
  textareaRef.current.focus();
235
+ // Call onValueChangeLocal only once
220
236
  onValueChangeLocal(newText);
221
237
  };
222
238
  const wrapBasedOnNewLines = () => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rh-support/components",
3
- "version": "2.1.90",
3
+ "version": "2.1.92",
4
4
  "description": "Contains all reusabel components for support app",
5
5
  "author": "Vikas Rathee <vrathee@redhat.com>",
6
6
  "license": "ISC",
@@ -70,8 +70,8 @@
70
70
  "@patternfly/react-table": "5.1.1",
71
71
  "@patternfly/react-tokens": "^5.4.0",
72
72
  "@rh-support/types": "2.0.5",
73
- "@rh-support/user-permissions": "2.1.55",
74
- "@rh-support/utils": "2.1.44",
73
+ "@rh-support/user-permissions": "2.1.57",
74
+ "@rh-support/utils": "2.1.46",
75
75
  "dompurify": "^2.2.6",
76
76
  "downshift": "^6.0.5",
77
77
  "js-worker-search": "^1.4.1",
@@ -111,5 +111,5 @@
111
111
  "defaults and supports es6-module",
112
112
  "maintained node versions"
113
113
  ],
114
- "gitHead": "6f241c61742b1a72ccc831ab45b267c163ea1284"
114
+ "gitHead": "8402b82ce0dac6a288aa9361ebb61f4a209f90e0"
115
115
  }