Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix table width #4380

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import {EditorState, ContentBlock} from 'draft-js';
import {TableBlock} from '../tables/TableBlock';
import {IActiveCell} from 'superdesk-api';

export const MULTI_LINE_QUOTE_CLASS = 'multi-line-quote';

interface IProps {
block: ContentBlock;
readOnly: boolean;
Expand All @@ -24,7 +26,8 @@ export class MultiLineQuoteComponent extends React.Component<IProps> {
render() {
return (
<TableBlock
className="multi-line-quote"
fullWidth
className={MULTI_LINE_QUOTE_CLASS}
toolbarStyle="multiLineQuote"
block={this.props.block}
readOnly={this.props.readOnly}
Expand Down
11 changes: 8 additions & 3 deletions scripts/core/editor3/components/tables/TableBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ interface IProps {
setCustomToolbar?(toolbarStyle: IEditorStore['customToolbarStyle']): void;
toolbarStyle?: IEditorStore['customToolbarStyle'];
className?: string;
fullWidth?: boolean;
}

/**
Expand Down Expand Up @@ -147,19 +148,23 @@ export class TableBlockComponent extends React.Component<IProps> {
'table-header': withHeader,
});

const fullWidthStyle = this.props.fullWidth ? {width: '100%'} : {};

return (
<div
style={fullWidthStyle}
className={cx}
onMouseDown={(e) => {
this.onMouseDown(e);
}}
>
<table>
<tbody>
<table style={fullWidthStyle}>
<tbody style={fullWidthStyle}>
{Array.from(new Array(numRows)).map((_, i) => (
<tr key={`col-${i}-${numRows}-${numCols}`}>
<tr style={fullWidthStyle} key={`col-${i}-${numRows}-${numCols}`}>
{Array.from(new Array(numCols)).map((__, j) => (
<TableCell
fullWidth={Object.keys(fullWidthStyle).length > 0}
key={`cell-${i}-${j}-${numRows}-${numCols}`}
readOnly={this.props.readOnly}
editorState={this.getCellEditorState(data, i, j)}
Expand Down
12 changes: 10 additions & 2 deletions scripts/core/editor3/components/tables/TableCell.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react';
import PropTypes from 'prop-types';
import {Editor, RichUtils, getDefaultKeyBinding, DraftHandleValue, SelectionState, EditorState} from 'draft-js';
import {getSelectedEntityType, getSelectedEntityRange} from '../links/entityUtils';
import {customStyleMap} from '../customStyleMap';
Expand All @@ -11,6 +10,7 @@ interface IProps {
onUndo: () => void;
onRedo: () => void;
onFocus: (styles: Array<string>, selection: SelectionState) => void;
fullWidth?: boolean;
}

interface IState {
Expand Down Expand Up @@ -185,9 +185,17 @@ export class TableCell extends React.Component<IProps, IState> {
render() {
const {editorState} = this.state;
const {readOnly} = this.props;
const fullWidthStyle = this.props.fullWidth ? {width: '100%'} : {};

return (
<td onClick={(event) => event.stopPropagation()}>
<td
// Disabling to prevent misbehavior and bugs when dragging & dropping text
onDragStart={(e) => {
e.preventDefault();
}}
style={fullWidthStyle}
onClick={(event) => event.stopPropagation()}
>
<Editor
onFocus={this.onFocus}
editorState={editorState}
Expand Down
1 change: 1 addition & 0 deletions scripts/core/editor3/components/tests/tables.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ describe('editor3.component.table-cell', () => {
it('should render', () => {
const wrapper = shallow(
<TableCell
fullWidth
editorState={EditorState.createWithContent(ContentState.createFromText('abc'))}
onChange={() => { /* no-op */ }}
readOnly={false}
Expand Down
3 changes: 2 additions & 1 deletion scripts/core/editor3/html/to-html/AtomicBlockParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {isQumuWidget, postProccessQumuEmbed} from '../../components/embeds/QumuW
import {logger} from 'core/services/logger';
import {editor3StateToHtml} from './editor3StateToHtml';
import {getData, IEditor3TableData} from 'core/editor3/helpers/table';
import {MULTI_LINE_QUOTE_CLASS} from 'core/editor3/components/multi-line-quote/MultiLineQuote';

/**
* @ngdoc class
Expand Down Expand Up @@ -200,7 +201,7 @@ export class AtomicBlockParser {
}

const {cells} = data;
let html = '<div class="multi-line-quote">';
let html = `<div class="${MULTI_LINE_QUOTE_CLASS}">`;
const cellContentState = cells[0]?.[0] != null
? convertFromRaw(cells[0][0])
: ContentState.createFromText('');
Expand Down
Loading