-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '1.x' into 753-missing-asset-context-menu-actions-upload…
…-new-version # Conflicts: # translations/studio.en.yaml
- Loading branch information
Showing
52 changed files
with
2,328 additions
and
1,904 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
...s/element/dynamic-types/defintinitions/grid-cell/components/number/number-cell.styles.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /** | ||
| * Pimcore | ||
| * | ||
| * This source file is available under two different licenses: | ||
| * - Pimcore Open Core License (POCL) | ||
| * - Pimcore Commercial License (PCL) | ||
| * Full copyright and license information is available in | ||
| * LICENSE.md which is distributed with this source code. | ||
| * | ||
| * @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org) | ||
| * @license https://github.com/pimcore/studio-ui-bundle/blob/1.x/LICENSE.md POCL and PCL | ||
| */ | ||
|
|
||
| import { createStyles } from 'antd-style' | ||
|
|
||
| export const useStyle = createStyles(({ token, css }) => { | ||
| return { | ||
| 'number-cell': css` | ||
| padding: 4px; | ||
| ` | ||
| } | ||
| }) |
78 changes: 78 additions & 0 deletions
78
.../modules/element/dynamic-types/defintinitions/grid-cell/components/number/number-cell.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /** | ||
| * Pimcore | ||
| * | ||
| * This source file is available under two different licenses: | ||
| * - Pimcore Open Core License (POCL) | ||
| * - Pimcore Commercial License (PCL) | ||
| * Full copyright and license information is available in | ||
| * LICENSE.md which is distributed with this source code. | ||
| * | ||
| * @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org) | ||
| * @license https://github.com/pimcore/studio-ui-bundle/blob/1.x/LICENSE.md POCL and PCL | ||
| */ | ||
|
|
||
| import React, { useEffect, useRef, useState } from 'react' | ||
| import { InputNumber } from 'antd' | ||
| import { useStyle } from './number-cell.styles' | ||
| import { type DefaultCellProps } from '@Pimcore/components/grid/columns/default-cell' | ||
| import { useEditMode } from '@Pimcore/components/grid/edit-mode/use-edit-mode' | ||
| import cn from 'classnames' | ||
| import type { InputNumberRef } from 'rc-input-number' | ||
|
|
||
| export interface NumberCellProps extends DefaultCellProps {} | ||
|
|
||
| export const NumberCell = (props: NumberCellProps): React.JSX.Element => { | ||
| const { isInEditMode, disableEditMode, fireOnUpdateCellDataEvent } = useEditMode(props) | ||
| const [value, setValue] = useState<number | null>(props.getValue() as number) | ||
| const { styles } = useStyle() | ||
| const element = useRef<InputNumberRef>(null) | ||
|
|
||
| useEffect(() => { | ||
| if (isInEditMode) { | ||
| element.current?.focus() | ||
| } | ||
| }, [isInEditMode]) | ||
|
|
||
| function saveValue (): void { | ||
| fireOnUpdateCellDataEvent(value) | ||
| disableEditMode() | ||
| } | ||
|
|
||
| function onKeyDown (event: React.KeyboardEvent<HTMLInputElement>): void { | ||
| if (event.key === 'Enter') { | ||
| saveValue() | ||
| } | ||
| } | ||
|
|
||
| function onBlur (): void { | ||
| saveValue() | ||
| } | ||
|
|
||
| function getCellContent (): React.JSX.Element { | ||
| if (!isInEditMode) { | ||
| return ( | ||
| <> | ||
| { props.getValue() } | ||
| </> | ||
| ) | ||
| } | ||
|
|
||
| return ( | ||
| <InputNumber | ||
| className="w-full" | ||
| defaultValue={ props.getValue() } | ||
| onBlur={ onBlur } | ||
| onChange={ setValue } | ||
| onKeyDown={ onKeyDown } | ||
| ref={ element } | ||
| value={ value } | ||
| /> | ||
| ) | ||
| } | ||
|
|
||
| return ( | ||
| <div className={ cn(styles['number-cell'], 'default-cell__content') }> | ||
| { getCellContent() } | ||
| </div> | ||
| ) | ||
| } |
26 changes: 26 additions & 0 deletions
26
...ent/dynamic-types/defintinitions/grid-cell/types/number/dynamic-type-grid-cell-number.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /** | ||
| * Pimcore | ||
| * | ||
| * This source file is available under two different licenses: | ||
| * - Pimcore Open Core License (POCL) | ||
| * - Pimcore Commercial License (PCL) | ||
| * Full copyright and license information is available in | ||
| * LICENSE.md which is distributed with this source code. | ||
| * | ||
| * @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org) | ||
| * @license https://github.com/pimcore/studio-ui-bundle/blob/1.x/LICENSE.md POCL and PCL | ||
| */ | ||
|
|
||
| import React, { type ReactElement } from 'react' | ||
| import { type AbstractGridCellDefinition, DynamicTypeGridCellAbstract } from '../../dynamic-type-grid-cell-abstract' | ||
| import { NumberCell } from '../../components/number/number-cell' | ||
| import { injectable } from 'inversify' | ||
|
|
||
| @injectable() | ||
| export class DynamicTypeGridCellNumber extends DynamicTypeGridCellAbstract { | ||
| readonly id = 'number' | ||
|
|
||
| getGridCellComponent (props: AbstractGridCellDefinition): ReactElement<AbstractGridCellDefinition> { | ||
| return <NumberCell { ...props } /> | ||
| } | ||
| } |
Oops, something went wrong.