Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
This commit is contained in:
commit
db2308128d
@ -78,7 +78,7 @@ class ToggleButton extends Component {
|
||||
//console.log("ToggleButton render");
|
||||
|
||||
return (
|
||||
<Container {...this.props}>
|
||||
<Container id={id} className={className} style={style}>
|
||||
<ToggleButtonContainer
|
||||
id={id}
|
||||
className={className}
|
||||
|
@ -198,6 +198,8 @@ const EditingWrapperComponent = (props) => {
|
||||
const [CancelIconIsHovered, setIsHoveredCancel] = useState(false);
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
|
||||
const inputRef = React.useRef(null);
|
||||
|
||||
const onKeyUpUpdateItem = (e) => {
|
||||
if (isLoading) return;
|
||||
|
||||
@ -228,6 +230,8 @@ const EditingWrapperComponent = (props) => {
|
||||
)
|
||||
return false;
|
||||
|
||||
if (!document.hasFocus() && inputRef.current === e.target) return false;
|
||||
|
||||
!passwordEntryProcess && onClickUpdateItem(e, false);
|
||||
};
|
||||
|
||||
@ -256,6 +260,7 @@ const EditingWrapperComponent = (props) => {
|
||||
isDisabled={isLoading}
|
||||
data-itemid={itemId}
|
||||
withBorder={!isTable}
|
||||
forwardedRef={inputRef}
|
||||
/>
|
||||
)}
|
||||
{!isUpdatingRowItem && (
|
||||
|
@ -56,7 +56,7 @@ const SingleItem = (props) => {
|
||||
<div className="property">
|
||||
<Text className="property-title">{t("Home:ByLastModifiedDate")}</Text>
|
||||
<Text className="property-content">
|
||||
{parseAndFormatDate(selectedItem.updatedAt)}
|
||||
{parseAndFormatDate(selectedItem.attributes.updatedAt)}
|
||||
</Text>
|
||||
</div>
|
||||
<div className="property">
|
||||
|
@ -69,7 +69,11 @@ const InfoPanelBodyContent = ({
|
||||
<GalleryEmptyScreen />
|
||||
) : (
|
||||
<StyledInfoRoomBody>
|
||||
<GalleryItem selectedItem={gallerySelected} />
|
||||
<GalleryItem
|
||||
selectedItem={gallerySelected}
|
||||
personal={personal}
|
||||
culture={culture}
|
||||
/>
|
||||
</StyledInfoRoomBody>
|
||||
)
|
||||
) : (
|
||||
|
@ -62,10 +62,15 @@ const StyledTableRow = styled(TableRow)`
|
||||
.table-container_file-name-cell {
|
||||
margin-left: -24px;
|
||||
padding-left: 24px;
|
||||
z-index: 1;
|
||||
}
|
||||
.table-container_row-context-menu-wrapper {
|
||||
margin-right: -20px;
|
||||
padding-right: 18px;
|
||||
|
||||
position: relative !important;
|
||||
|
||||
z-index: 1;
|
||||
}
|
||||
}
|
||||
`}
|
||||
|
@ -906,7 +906,7 @@ class FilesStore {
|
||||
"separator2",
|
||||
"delete",
|
||||
]);
|
||||
if (isThirdPartyFolder) {
|
||||
if (isThirdPartyItem) {
|
||||
fileOptions = this.removeOptions(fileOptions, ["rename"]);
|
||||
}
|
||||
}
|
||||
|
@ -15,7 +15,7 @@
|
||||
line-height: 80px;
|
||||
font-family: Helvetica Neue, sans-serif;
|
||||
background: #f4f4f4;
|
||||
z-index: 9998;
|
||||
z-index: 100;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
overflow: hidden;
|
||||
-webkit-text-size-adjust: none;
|
||||
|
Loading…
Reference in New Issue
Block a user