Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix : icons are not getting hidden (#10509)

Browse source
This commit is contained in:
Kiran Ashok 2024-07-31 10:02:21 +05:30 committed by GitHub
parent fdbeb5612d
commit 5456786ff4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frontend/src/Editor/Components/NumberInput.jsx
View file

@ -140,7 +140,7 @@ export const NumberInput = function NumberInput({
width,
auto,
defaultAlignment,
component?.definition?.styles?.iconVisibility?.value,
styles?.iconVisibility,
labelRef?.current?.getBoundingClientRect()?.width,
isMandatory,
padding,
@ -157,7 +157,7 @@ export const NumberInput = function NumberInput({
height: height == 36 ? (padding == 'default' ? '36px' : '40px') : padding == 'default' ? height : height + 4,
borderRadius: `${borderRadius}px`,
boxShadow: boxShadow,
padding: styles.iconVisibility
padding: styles?.iconVisibility
? height < 20
? '0px 10px 0px 29px'
: '8px 10px 8px 29px'
@ -316,7 +316,7 @@ export const NumberInput = function NumberInput({
_width={_width}
labelWidth={labelWidth}
/>
{component?.definition?.styles?.iconVisibility?.value && !isResizing && (
{styles?.iconVisibility && !isResizing && (
<IconElement
data-cy={'text-input-icon'}
style={{

8
frontend/src/Editor/Components/PasswordInput.jsx
View file

@ -55,7 +55,7 @@ export const PasswordInput = function PasswordInput({
const tinycolor = require('tinycolor2');
const _width = (width / 100) * 70; // Max width which label can go is 70% for better UX calculate width based on this value
console.log('style---', styles);
const computedStyles = {
height: height == 36 ? (padding == 'default' ? '36px' : '40px') : padding == 'default' ? height : height + 4,
borderRadius: `${borderRadius}px`,
@ -67,7 +67,7 @@ export const PasswordInput = function PasswordInput({
: 'var(--surfaces-surface-03)'
: 'var(--surfaces-surface-01)',
boxShadow: boxShadow,
padding: styles.iconVisibility ? '8px 10px 8px 29px' : '8px 10px 8px 10px',
padding: styles?.iconVisibility ? '8px 10px 8px 29px' : '8px 10px 8px 10px',
overflow: 'hidden',
textOverflow: 'ellipsis',
color: textColor !== '#1B1F24' ? textColor : disable || loading ? 'var(--text-disabled)' : 'var(--text-primary)',
@ -120,7 +120,7 @@ export const PasswordInput = function PasswordInput({
width,
auto,
defaultAlignment,
component?.definition?.styles?.iconVisibility?.value,
styles?.iconVisibility,
label?.length,
isMandatory,
padding,
@ -277,7 +277,7 @@ export const PasswordInput = function PasswordInput({
_width={_width}
labelWidth={labelWidth}
/>
{component?.definition?.styles?.iconVisibility?.value && !isResizing && (
{styles?.iconVisibility && !isResizing && (
<IconElement
data-cy={'text-input-icon'}
style={{

6
frontend/src/Editor/Components/TextInput.jsx
View file

@ -76,7 +76,7 @@ export const TextInput = function TextInput({
: 'var(--surfaces-surface-03)'
: 'var(--surfaces-surface-01)',
boxShadow: boxShadow,
padding: styles.iconVisibility
padding: styles?.iconVisibility
? height < 20
? '0px 10px 0px 29px'
: '8px 10px 8px 29px'
@ -117,7 +117,7 @@ export const TextInput = function TextInput({
width,
auto,
defaultAlignment,
component?.definition?.styles?.iconVisibility?.value,
styles?.iconVisibility,
label?.length,
isMandatory,
padding,
@ -271,7 +271,7 @@ export const TextInput = function TextInput({
isMandatory={isMandatory}
_width={_width}
/>
{component?.definition?.styles?.iconVisibility?.value && !isResizing && (
{styles?.iconVisibility && !isResizing && (
<IconElement
data-cy={'text-input-icon'}
style={{