Skip to content

Add/365 freeform block #880

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.

Sign up for GitHub

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

Merged
BoardJames merged 17 commits into from
Jun 5, 2017
Merged

Add/365 freeform block #880

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3e9d958
Basic freeform block
tiny-james May 24, 2017
9a893fd
Re-add unknown type handler; remove console logs; cleanup
tiny-james May 24, 2017
d3a6292
Replaced spaces with tabs
tiny-james May 25, 2017
3c56919
Merge branch 'master' into add/365-freeform-block
tiny-james May 25, 2017
d95a968
Merge branch 'master' into add/365-freeform-block
tiny-james May 26, 2017
73984d0
Avoid outputting internal values in serialized form
tiny-james May 26, 2017
ace3c3c
Update core-freeform serialization test
tiny-james May 26, 2017
4e37bd5
Merge branch 'master' into add/365-freeform-block
tiny-james May 31, 2017
c40f184
Moved internal state out of attributes into react component private s…
tiny-james May 31, 2017
d0ccb06
Initialized some state
tiny-james May 31, 2017
ff25725
Merge branch 'master' into add/365-freeform-block
tiny-james Jun 1, 2017
9029f09
Merge branch 'master' into add/365-freeform-block
tiny-james Jun 1, 2017
28fad95
Try to hook into TinyMCE button state
tiny-james Jun 2, 2017
30a0fb6
Merge branch 'master' into add/365-freeform-block
tiny-james Jun 4, 2017
c49d9a1
Initilize alignment controls so the button states can be rendered
tiny-james Jun 5, 2017
58c4735
Reorganise code
tiny-james Jun 5, 2017
9d61284
Set state based on previous state correctly
tiny-james Jun 5, 2017
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
Prev Previous commit
Next Next commit
Re-add unknown type handler; remove console logs; cleanup
  • Loading branch information
@tiny-james
tiny-james committed May 24, 2017
commit 9a893fde01fac71f71438af229a3e9cd6fb9973a
26 changes: 10 additions & 16 deletions blocks/library/freeform/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { find } from 'lodash';
* Internal dependencies
*/
import './style.scss';
import { registerBlock, query } from '../../api';
import { registerBlock, query, setUnknownTypeHandler } from '../../api';
import Editable from '../../editable';

const { children } = query;
Expand All @@ -22,31 +22,24 @@ function execCommand( command ) {

function blockQuoteIsActive() {
return ( { inBlockQuote } ) => {
console.log( 'inQuote:', inBlockQuote );
return inBlockQuote;
};
}

function listIsActive( expectedListType ) {
return ( { listType } ) => {
const inList = expectedListType === listType;
console.log( 'inList:', inList );
return inList;
return expectedListType === listType;
};
}

function findParentList( { parents } ) {
function findListType( { parents } ) {
const list = find( parents, ( node ) => node.nodeName === 'UL' || node.nodeName === 'OL' );
const listType = list ? list.nodeName : null;
console.log( 'listType:', listType );
return listType;
return list ? list.nodeName : null;
}

function findParentQuote( { parents } ) {
function findInBlockQuote( { parents } ) {
const quote = find( parents, ( node ) => node.nodeName === 'BLOCKQUOTE' );
const inBlockQuote = ! ! quote;
console.log( 'inBlockQuote:', inBlockQuote );
return inBlockQuote;
return ! ! quote;
}

registerBlock( 'core/freeform', {
Expand Down Expand Up @@ -113,10 +106,9 @@ registerBlock( 'core/freeform', {
} ) }
onSetup={ ( editor ) => {
editor.on( 'nodeChange', ( nodeInfo ) => {
console.log( 'nodeChange ', nodeInfo );
setAttributes( {
listType: findParentList( nodeInfo ),
inBlockQuote: findParentQuote( nodeInfo ),
listType: findListType( nodeInfo ),
inBlockQuote: findInBlockQuote( nodeInfo ),
Copy link
Contributor

@youknowriad youknowriad May 30, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like @nylen mentioned, we shouldn't use setAttributes for "temporary" state that is not going to be persisted in the block output markup. We should use local state for this (the edit here can be a regular React Component).

You'll be able to access the local state in the controls if you embed the controls inside the edit function (see #830)

} );
} );
setAttributes( { editor } );
Expand All @@ -138,3 +130,5 @@ registerBlock( 'core/freeform', {
return content;
},
} );

setUnknownTypeHandler( 'core/freeform' );