@jetbrains/ring-ui 6.0.4-beta.0 → 6.0.4

package/components/dialog/dialog.css

@@ -1,6 +1,5 @@
 @import "../global/variables.css";
 
-@value unit from "../global/global.css";
 @value header from "../island/island.css";
 
 .container {
@@ -16,7 +15,7 @@
   align-items: center;
   justify-content: center;
 
-  padding: calc(unit * 4) unit;
+  padding: calc(var(--ring-unit) * 4) var(--ring-unit);
 
   background-color: rgba(var(--ring-dialog-overlay-components), 0.4);
 }
@@ -31,20 +30,20 @@
 .content {
   position: relative;
 
-  width: calc(unit * 58);
-  min-height: calc(unit * 15);
+  width: calc(var(--ring-unit) * 58);
+  min-height: calc(var(--ring-unit) * 15);
   margin: auto;
 
   cursor: default;
   overflow-wrap: break-word;
 
   & [data-scrollable-container] {
-    padding-bottom: unit;
+    padding-bottom: var(--ring-unit);
   }
 
   & .panel {
     margin-top: 0;
-    padding: calc(unit * 2) calc(unit * 4) calc(unit * 4);
+    padding: calc(var(--ring-unit) * 2) calc(var(--ring-unit) * 4) calc(var(--ring-unit) * 4);
 
     border-top: none;
 
@@ -53,7 +52,7 @@
 
   /* stylelint-disable-next-line selector-max-specificity */
   & .panel > button:not(:last-child) {
-    margin-right: unit;
+    margin-right: var(--ring-unit);
   }
 }
 
@@ -93,12 +92,12 @@
 
 .closeButtonOutside {
   top: 0;
-  right: calc(unit * -4);
+  right: calc(var(--ring-unit) * -4);
 }
 
 .closeButtonInside {
-  top: calc(unit * 1.5);
-  right: unit;
+  top: calc(var(--ring-unit) * 1.5);
+  right: var(--ring-unit);
 }
 
 .documentWithoutScroll {
@@ -123,16 +122,16 @@
 }
 
 .container .header {
-  padding-top: calc(unit * 4);
+  padding-top: calc(var(--ring-unit) * 4);
 
   font-size: 24px;
   line-height: 28px;
 }
 
 .dense .header {
-  padding-top: calc(unit * 2);
+  padding-top: calc(var(--ring-unit) * 2);
 }
 
 .dense .panel {
-  padding-bottom: calc(unit * 2);
+  padding-bottom: calc(var(--ring-unit) * 2);
 }

package/components/editable-heading/editable-heading.css

@@ -1,5 +1,3 @@
-@value unit from "../global/global.css";
-
 .editableHeading {
   display: flex;
   align-items: center;
@@ -11,7 +9,7 @@
   }
 
   &.isEditing {
-    gap: unit;
+    gap: var(--ring-unit);
   }
 }
 
@@ -131,22 +129,29 @@
   resize: none;
 }
 
-.textareaWrapper {
-  position: relative;
+.textareaNotOverflow {
+  overflow: hidden;
+}
 
-  &::after {
-    position: absolute;
-    bottom: 6px;
-    left: 0;
+.textareaFade {
+  position: absolute;
+  bottom: 0;
+  left: 0;
 
-    width: 100%;
-    height: 30px;
+  width: 100%;
+  height: 30px;
 
-    content: "";
-    pointer-events: none;
+  content: "";
+  pointer-events: none;
 
-    background: linear-gradient(to bottom, rgba(var(--ring-content-background-components), 0), rgba(var(--ring-content-background-components), 1));
-  }
+  background: linear-gradient(to bottom, rgba(var(--ring-content-background-components), 0), rgba(var(--ring-content-background-components), 1));
+}
+
+
+.textareaWrapper {
+  position: relative;
+
+  display: flex;
 }
 
 .button {
@@ -154,7 +159,7 @@
 }
 
 .errorText {
-  margin: calc(unit / 2) 0;
+  margin: calc(var(--ring-unit) / 2) 0;
 
   color: var(--ring-error-color);
 
@@ -171,19 +176,19 @@
 }
 
 .level3 {
-  font-size: 14px;
+  font-size: 16px;
 }
 
 .sizeS {
-  max-width: calc(unit * 12);
+  max-width: calc(var(--ring-unit) * 12);
 }
 
 .sizeM {
-  max-width: calc(unit * 30);
+  max-width: calc(var(--ring-unit) * 30);
 }
 
 .sizeL {
-  max-width: calc(unit * 50);
+  max-width: calc(var(--ring-unit) * 50);
 }
 
 .sizeFULL {

package/components/editable-heading/editable-heading.d.ts

@@ -23,7 +23,7 @@ export type EditableHeadingProps = Omit<InputHTMLAttributes<HTMLInputElement | H
     'data-test'?: string | null;
     error?: string;
     multiline?: boolean;
-    multilineInputRows?: number;
+    maxInputRows?: number;
     renderMenu?: () => React.ReactNode;
     translations?: EditableHeadingTranslations;
 };

package/components/editable-heading/editable-heading.js

@@ -9,19 +9,19 @@ import Shortcuts from '../shortcuts/shortcuts';
 import styles from './editable-heading.css';
 export { Levels };
 export { Size };
-const DEFAULT_MULTILINE_INPUT_ROWS = 3;
 function noop() { }
 export const EditableHeading = (props) => {
-    const { level = Levels.H1, className, headingClassName, inputClassName, children, isEditing = false, isSavingPossible = false, isSaving = false, embedded = false, size = Size.L, onEdit = noop, onSave = noop, onCancel = noop, autoFocus = true, 'data-test': dataTest, error, disabled, multiline = false, renderMenu = () => null, onFocus, onBlur, translations = {
+    const { level = Levels.H1, className, headingClassName, inputClassName, children, isEditing = false, isSavingPossible = false, isSaving = false, embedded = false, size = Size.L, onEdit = noop, onSave = noop, onCancel = noop, autoFocus = true, 'data-test': dataTest, error, disabled, multiline = false, renderMenu = () => null, onFocus, onBlur, onChange, onScroll, maxInputRows, translations = {
         save: 'Save',
         cancel: 'Cancel'
-    }, multilineInputRows = DEFAULT_MULTILINE_INPUT_ROWS, ...restProps } = props;
+    }, ...restProps } = props;
     const [shortcutsScope] = React.useState(getUID('ring-editable-heading-'));
     const [isInFocus, setIsInFocus] = React.useState(false);
     const [isMouseDown, setIsMouseDown] = React.useState(false);
     const [isInSelectionMode, setIsInSelectionMode] = React.useState(false);
     const textAreaRef = React.useRef(null);
-    const textAreaWrapperRef = React.useRef(null);
+    const [isScrolledToBottom, setIsScrolledToBottom] = React.useState(false);
+    const [isOverflow, setIsOverflow] = React.useState(false);
     const hasError = error !== undefined;
     const isSaveDisabled = !isSavingPossible || !children || children.trim() === '' || hasError || isSaving;
     const isCancelDisabled = isSaving;
@@ -45,7 +45,27 @@ export const EditableHeading = (props) => {
         [styles.selectionMode]: isInSelectionMode
     });
     const headingClasses = classNames(styles.heading, headingClassName, styles[`size${size}`]);
-    const inputClasses = classNames('ring-js-shortcuts', styles.input, styles.textarea, inputStyles[`size${size}`], styles[`level${level}`], inputClassName);
+    const inputClasses = classNames('ring-js-shortcuts', styles.input, styles.textarea, { [styles.textareaNotOverflow]: !isOverflow }, inputStyles[`size${size}`], styles[`level${level}`], inputClassName);
+    const stretch = useCallback((el) => {
+        if (!el || !el.style) {
+            return;
+        }
+        el.style.height = '0';
+        const { paddingTop, paddingBottom } = window.getComputedStyle(el);
+        el.style.height = `${el.scrollHeight - parseFloat(paddingTop) - parseFloat(paddingBottom)}px`;
+    }, []);
+    const checkValue = useCallback((el) => {
+        if (multiline && el != null && el.scrollHeight >= el.clientHeight) {
+            stretch(el);
+        }
+    }, [stretch, multiline]);
+    const checkOverflow = useCallback((el) => {
+        const scrollHeight = el.scrollHeight || 0;
+        const clientHeight = el.clientHeight || 0;
+        const scrollTop = el.scrollTop || 0;
+        setIsScrolledToBottom(scrollHeight - clientHeight <= scrollTop);
+        setIsOverflow(scrollHeight > clientHeight);
+    }, [setIsScrolledToBottom]);
     const onHeadingMouseDown = React.useCallback(() => {
         setIsMouseDown(true);
     }, []);
@@ -64,37 +84,31 @@ export const EditableHeading = (props) => {
     }, [isMouseDown, isInSelectionMode, disabled, onEdit]);
     const onInputFocus = React.useCallback((e) => {
         setIsInFocus(true);
+        checkValue(e.target);
+        checkOverflow(e.target);
         onFocus?.(e);
-    }, [onFocus]);
+    }, [onFocus, checkOverflow, checkValue]);
+    const onInputChange = React.useCallback((e) => {
+        checkValue(e.target);
+        checkOverflow(e.target);
+        onChange?.(e);
+    }, [onChange, checkOverflow, checkValue]);
+    const onInputScroll = React.useCallback((e) => {
+        checkOverflow(e.target);
+        onScroll?.(e);
+    }, [onScroll, checkOverflow]);
     const onInputBlur = React.useCallback((e) => {
         setIsInFocus(false);
         onBlur?.(e);
     }, [onBlur]);
-    const onScroll = useCallback(() => {
-        const scrollHeight = textAreaRef?.current?.scrollHeight || 0;
-        const clientHeight = textAreaRef?.current?.clientHeight || 0;
-        const scrollTop = textAreaRef?.current?.scrollTop || 0;
-        const isScrolledToBottom = scrollHeight - clientHeight <= scrollTop;
-        if (isScrolledToBottom) {
-            textAreaWrapperRef?.current?.classList.remove(styles.textareaWrapper);
-        }
-        else {
-            textAreaWrapperRef?.current?.classList.add(styles.textareaWrapper);
-        }
-    }, []);
     useEffect(() => {
-        const textAreaRefCurrent = textAreaRef?.current;
-        textAreaRefCurrent?.addEventListener('scroll', onScroll);
         window.addEventListener('mousemove', onMouseMove);
         window.addEventListener('mouseup', onMouseUp);
         return () => {
             window.removeEventListener('mousemove', onMouseMove);
             window.removeEventListener('mouseup', onMouseUp);
-            if (textAreaRefCurrent) {
-                textAreaRefCurrent.removeEventListener('scroll', onScroll);
-            }
         };
-    }, [onMouseMove, onMouseUp, onScroll]);
+    }, [onMouseMove, onMouseUp]);
     return (<>
       <div className={classes}>
         {!disabled && isEditing
@@ -102,9 +116,10 @@ export const EditableHeading = (props) => {
               <Shortcuts map={shortcutsMap} scope={shortcutsScope} disabled={isShortcutsDisabled}/>
 
               {!multiline
-                    ? (<input className={inputClasses} value={children} autoFocus={autoFocus} data-test={dataTest} disabled={isSaving} {...restProps} onFocus={onInputFocus} onBlur={onInputBlur}/>)
-                    : (<div ref={textAreaWrapperRef} className={styles.textareaWrapper}>
-                    <textarea ref={textAreaRef} className={inputClasses} value={children} autoFocus={autoFocus} rows={multilineInputRows} data-test={dataTest} disabled={isSaving} {...restProps} onFocus={onInputFocus} onBlur={onInputBlur}/>
+                    ? (<input className={inputClasses} value={children} autoFocus={autoFocus} data-test={dataTest} disabled={isSaving} onChange={onChange} {...restProps} onFocus={onInputFocus} onBlur={onInputBlur}/>)
+                    : (<div className={classNames(styles.textareaWrapper, inputStyles[`size${size}`])}>
+                    <textarea ref={textAreaRef} className={inputClasses} value={children} autoFocus={autoFocus} data-test={dataTest} disabled={isSaving} onChange={onInputChange} {...restProps} onFocus={onInputFocus} onBlur={onInputBlur} onScroll={onInputScroll} style={{ maxHeight: maxInputRows ? `${maxInputRows}lh` : '' }}/>
+                    {!isScrolledToBottom && <div className={styles.textareaFade}/>}
                   </div>)}
             </>)
             : (<button type="button" className={styles.headingWrapperButton} onMouseDown={onHeadingMouseDown}>

package/components/error-bubble/error-bubble-legacy.css

@@ -1,5 +1,3 @@
-@value unit from "../global/global.css";
-
 :global(.ring-error-bubble) {
   position: absolute;
   z-index: 2;
@@ -9,9 +7,9 @@
   display: none;
 
   box-sizing: border-box;
-  min-height: calc(3 * unit);
-  padding-right: calc(2 * unit);
-  padding-left: calc(2 * unit);
+  min-height: calc(3 * var(--ring-unit));
+  padding-right: calc(2 * var(--ring-unit));
+  padding-left: calc(2 * var(--ring-unit));
 
   white-space: nowrap;
 
@@ -41,8 +39,8 @@
 
   display: block;
 
-  width: unit;
-  height: unit;
+  width: var(--ring-unit);
+  height: var(--ring-unit);
 
   content: "";
   transform: rotate(45deg);
@@ -55,7 +53,7 @@
 }
 
 :global(.ring-error-bubble_material) {
-  padding-left: unit;
+  padding-left: var(--ring-unit);
 
   border: 0;
   background: transparent none;

package/components/error-bubble/error-bubble.css

@@ -1,7 +1,5 @@
 @import "../global/variables.css";
 
-@value unit from "../global/global.css";
-
 .errorBubblePopup {
   overflow: visible;
 
@@ -18,9 +16,9 @@
 
 .errorBubble {
   box-sizing: border-box;
-  min-height: calc(unit * 3);
-  padding-right: calc(unit * 2);
-  padding-left: calc(unit * 2);
+  min-height: calc(var(--ring-unit) * 3);
+  padding-right: calc(var(--ring-unit) * 2);
+  padding-left: calc(var(--ring-unit) * 2);
 
   white-space: nowrap;
 
@@ -38,13 +36,13 @@
 
 .errorBubble::before {
   position: absolute;
-  top: unit;
+  top: var(--ring-unit);
   left: -4px;
 
   display: block;
 
-  width: unit;
-  height: unit;
+  width: var(--ring-unit);
+  height: var(--ring-unit);
 
   content: "";
   transform: rotate(45deg);

package/components/footer/footer.css

@@ -1,16 +1,14 @@
 @import "../global/variables.css";
 
-@value unit, footer-height from "../global/global.css";
-
 .footer {
   composes: font from "../global/global.css";
 
   position: relative;
 
   box-sizing: border-box;
-  height: footer-height;
-  margin: calc(unit * 5) calc(unit * 4) 0 calc(unit * 4);
-  padding-top: calc(unit * 2);
+  height: calc(var(--ring-unit) * 8);
+  margin: calc(var(--ring-unit) * 5) calc(var(--ring-unit) * 4) 0 calc(var(--ring-unit) * 4);
+  padding-top: calc(var(--ring-unit) * 2);
 
   text-align: center;
 
@@ -28,7 +26,7 @@
 
   width: 100%;
   margin-right: 0;
-  margin-bottom: unit;
+  margin-bottom: var(--ring-unit);
   margin-left: 0;
 }
 
@@ -66,7 +64,7 @@
 .columnRight {
   composes: column;
 
-  top: calc(unit * 2);
+  top: calc(var(--ring-unit) * 2);
   right: 0;
 
   text-align: right;
@@ -77,7 +75,7 @@
 
   list-style: none;
 
-  line-height: calc(unit * 2);
+  line-height: calc(var(--ring-unit) * 2);
 }
 
 .lineCenter {

package/components/form/form.css

@@ -1,7 +1,5 @@
 @import "../global/variables.css";
 
-@value unit from "../global/global.css";
-
 /**
  * @name Form
 */
@@ -29,25 +27,25 @@
 }
 
 :global(.ring-form_rows.ring-form__control) {
-  width: calc(42 * unit);
+  width: calc(42 * var(--ring-unit));
   margin-left: 0;
 }
 
 :global(.ring-form__wrap) {
   margin-bottom: 0;
-  padding: calc(3 * unit) calc(4 * unit) 0 calc(4 * unit);
+  padding: calc(3 * var(--ring-unit)) calc(4 * var(--ring-unit)) 0 calc(4 * var(--ring-unit));
 }
 
 :global(.ring-form__header) {
   min-height: 13px;
-  padding-bottom: calc(2 * unit);
+  padding-bottom: calc(2 * var(--ring-unit));
 }
 
 :global(.ring-form__control__description) {
   display: block;
 
   max-width: 900px;
-  padding-top: calc(unit / 2);
+  padding-top: calc(var(--ring-unit) / 2);
 
   color: var(--ring-secondary-color);
 
@@ -58,7 +56,7 @@
 :global(.ring-form__title-img) {
   float: left;
 
-  height: calc(4 * unit);
+  height: calc(4 * var(--ring-unit));
 
   border: 0;
 }
@@ -66,7 +64,7 @@
 :global(.ring-form__title) {
   display: block;
 
-  margin-bottom: calc(unit);
+  margin-bottom: calc(var(--ring-unit));
 
   font-weight: bold;
 }
@@ -79,13 +77,13 @@
 }
 
 :global(.ring-form__title_separated) {
-  margin: calc(unit * 3) 0;
+  margin: calc(var(--ring-unit) * 3) 0;
 }
 
 :global(.ring-form__group) {
   position: relative;
 
-  margin: calc(unit * 2) 0;
+  margin: calc(var(--ring-unit) * 2) 0;
 }
 
 :global(.ring-form__group:first-child) {
@@ -105,20 +103,20 @@
 
 :global(.ring-form__group .ring_form__group) {
   padding-top: 0;
-  padding-left: calc(unit * 2);
+  padding-left: calc(var(--ring-unit) * 2);
 }
 
 :global(.ring-form__group .ring_form__group .ring-form__control) {
-  margin-left: calc(18 * unit);
+  margin-left: calc(18 * var(--ring-unit));
 }
 
 :global(.ring-form__group_nested) {
   padding-top: 0;
-  padding-left: calc(unit * 2);
+  padding-left: calc(var(--ring-unit) * 2);
 }
 
 :global(.ring-form__group_nested .ring-form__control) {
-  margin-left: calc(18 * unit);
+  margin-left: calc(18 * var(--ring-unit));
 }
 
 :global(.ring-form__label) {
@@ -128,12 +126,12 @@
   display: inline-block;
   float: left;
 
-  max-width: calc(18 * unit);
-  padding-top: calc(unit / 2);
+  max-width: calc(18 * var(--ring-unit));
+  padding-top: calc(var(--ring-unit) / 2);
 
   vertical-align: top;
 
-  line-height: calc(2 * unit);
+  line-height: calc(2 * var(--ring-unit));
 }
 
 :global(.ring-form__label .ring-radio-btn__label) {
@@ -154,18 +152,18 @@
   position: relative;
 
   width: auto;
-  min-height: calc(3 * unit);
-  margin-left: calc(20 * unit);
+  min-height: calc(3 * var(--ring-unit));
+  margin-left: calc(20 * var(--ring-unit));
 
   vertical-align: top;
 
-  line-height: calc(3 * unit);
+  line-height: calc(3 * var(--ring-unit));
 }
 
 :global(.ring-form__control_text::after) {
   display: inline-block;
 
-  height: calc(unit * 3);
+  height: calc(var(--ring-unit) * 3);
 
   content: "";
   vertical-align: middle;
@@ -174,8 +172,8 @@
 /* Temporary solution, proper grid is necessary */
 :global(.ring-form__control_secondary) {
   position: absolute;
-  top: unit;
-  left: calc(27 * unit);
+  top: var(--ring-unit);
+  left: calc(27 * var(--ring-unit));
 }
 
 :global(.ring-form__control_on) {
@@ -192,19 +190,19 @@
 }
 
 :global(.ring-form__control_small) {
-  margin-left: calc(16 * unit) !important;
+  margin-left: calc(16 * var(--ring-unit)) !important;
 }
 
 :global(.ring-form__info) {
-  width: calc(85 * unit);
-  margin-bottom: calc(-1 * unit + 2px);
-  margin-left: calc(20 * unit);
+  width: calc(85 * var(--ring-unit));
+  margin-bottom: calc(-1 * var(--ring-unit) + 2px);
+  margin-left: calc(20 * var(--ring-unit));
 
   line-height: 20px;
 }
 
 :global(.ring-form__control__part) {
-  margin-right: unit;
+  margin-right: var(--ring-unit);
 }
 
 /* Form for key-value data
@@ -247,22 +245,22 @@
  </form> */
 
 :global(.ring-form__group_short) {
-  padding-top: calc(unit / 2);
+  padding-top: calc(var(--ring-unit) / 2);
   padding-bottom: 0;
 }
 
 :global(.ring-form__group_short:last-child) {
-  padding-bottom: unit;
+  padding-bottom: var(--ring-unit);
 }
 
 :global(.ring-form__group_short.ring-form__control) {
-  margin-left: calc(unit * 3);
+  margin-left: calc(var(--ring-unit) * 3);
 }
 
 :global(.ring-form_small .ring-form__label) {
-  max-width: calc(12 * unit);
+  max-width: calc(12 * var(--ring-unit));
 }
 
 :global(.ring-form_small .ring-form__control) {
-  margin-left: calc(16 * unit);
+  margin-left: calc(16 * var(--ring-unit));
 }

package/components/global/global.css

@@ -1,11 +1,5 @@
 /* https://readymag.com/artemtiunov/RingUILanguage/colours/ */
 
-/*
-Unit shouldn't be CSS custom property because it is not intended to change
-Also it won't form in FF47 https://bugzilla.mozilla.org/show_bug.cgi?id=594933
-*/
-@value unit: 8px;
-
 .clearfix {
   &::after {
     display: block;
@@ -93,7 +87,7 @@ Also it won't form in FF47 https://bugzilla.mozilla.org/show_bug.cgi?id=594933
 }
 
 /* Note: footer also has top margin which isn't taken into account here */
-@value footer-height: calc(unit * 8);
+@value footer-height: calc(var(--ring-unit) * 8);
 
 /* Media breakpoints (minimal values) */
 @value breakpoint-small: 640px;

package/components/global/variables_dark.css

@@ -91,8 +91,8 @@
   --ring-warning-background-color: rgb(var(--ring-warning-background-components)); /* #5e4d33 */
   --ring-added-background-components: 51, 76, 53;
   --ring-added-background-color: rgb(var(--ring-added-background-components)); /* #334c35 */
-  --ring-disabled-background-components: 38, 40, 43;
-  --ring-disabled-background-color: rgb(var(--ring-disabled-background-components)); /* #26282B */
+  --ring-disabled-background-components: 45, 47, 50;
+  --ring-disabled-background-color: rgb(var(--ring-disabled-background-components)); /* #2D2F32 */
   --ring-disabled-selected-background-components: 44, 47, 51;
   --ring-disabled-selected-background-color: rgb(var(--ring-disabled-selected-background-components)); /* #2C2F33 */
   --ring-button-danger-active-components: 38, 8, 10;

package/components/grid/grid.css

@@ -1,10 +1,10 @@
 @import "../global/variables.css";
 
-@value unit, breakpoint-small, breakpoint-middle, breakpoint-large  from "../global/global.css";
+@value breakpoint-small, breakpoint-middle, breakpoint-large  from "../global/global.css";
 @value large-screen-media, middle-screen-media, small-screen-media from "../global/global.css";
-@value gutterWidth: (unit*2);
+@value gutterWidth: (var(--ring-unit) * 2);
 @value gutterCompensation: calc(gutterWidth / -2);
-@value outerMargin: calc(unit*2);
+@value outerMargin: calc(var(--ring-unit) * 2);
 @value containerSmall: calc(breakpoint-small + gutterWidth);
 @value containerMedium: calc(breakpoint-middle + gutterWidth);
 @value containerLarge: calc(breakpoint-large + gutterWidth);
@@ -28,7 +28,7 @@
 }
 
 .container-fluid {
-  min-width: calc(unit * 40);
+  min-width: calc(var(--ring-unit) * 40);
   padding-right: outerMargin;
   padding-left: outerMargin;
 }
@@ -48,8 +48,8 @@
 }
 
 .col {
-  margin-top: unit;
-  margin-bottom: unit;
+  margin-top: var(--ring-unit);
+  margin-bottom: var(--ring-unit);
 }
 
 .col.reverse {