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.

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

add anchor option to accordion & toggle blocks #92

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add anchor option to accordion & toggle blocks #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/blocks/accordion/accordion-item/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class AccordionItem extends Component {
...this.props,
} } key={ 'inspector' }/>
<div {...itemClass}>
<div className={`wp-block-getwid-accordion__header-wrapper`} key='header'>
<div className={`wp-block-getwid-accordion__header-wrapper`} key='header' id={this.props.attributes.anchor}>
<Tag className={`wp-block-getwid-accordion__header`}>
<a href="#">
<div className={`wp-block-getwid-accordion__edit-area`}>
Expand Down
3 changes: 2 additions & 1 deletion src/blocks/accordion/accordion-item/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export default registerBlockType(
category: 'getwid-blocks',
parent: [ 'getwid/accordion' ],
supports: {
anchor: true,
multiple: true,
reusable: false,
html: false
Expand All @@ -50,4 +51,4 @@ export default registerBlockType(
}} />
)
}
);
);
6 changes: 3 additions & 3 deletions src/blocks/accordion/accordion-item/save.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ class Save extends Component {

render() {
const {className, baseClass} = this.props;
const {outerParent, title} = this.props.attributes;
const {outerParent, title, anchor} = this.props.attributes;

const Tag = outerParent ? outerParent.attributes.headerTag : 'span';
const iconOpen = outerParent ? outerParent.attributes.iconOpen : 'fas fa-minus';
const iconClose = outerParent ? outerParent.attributes.iconClose : 'fas fa-plus';

return (
<Fragment>
<div className={`wp-block-getwid-accordion__header-wrapper`}>
<div className={`wp-block-getwid-accordion__header-wrapper`} id={anchor}>
{title && (
<Tag className={`wp-block-getwid-accordion__header`}>
<a href="#">
Expand All @@ -52,4 +52,4 @@ class Save extends Component {
}
}

export default Save;
export default Save;
1 change: 1 addition & 0 deletions src/blocks/accordion/accordion/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ class Accordion extends Component {
},
align ? `align${align}` : null
)}
id={this.props.attributes.anchor}
data-active-element={active != undefined ? active : '0'}
>
<Provider value={this}>
Expand Down
1 change: 1 addition & 0 deletions src/blocks/accordion/accordion/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export default registerBlockType(
icon: <SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g><Path d="M0,0v6h24V0H0z M22,4H2V2h20V4z"/></g><g><Path d="M0,18v6h24v-6H0z M22,22H2v-2h20V22z"/></g><g><Path d="M0,8v8h24V8H0z M22,14H2v-4h20V14z"/></g></SVG>,
category: 'getwid-blocks',
supports: {
anchor: true,
align: [ 'wide', 'full' ],
inserter: !Getwid.disabled_blocks.includes(blockName)
},
Expand Down
4 changes: 3 additions & 1 deletion src/blocks/accordion/accordion/save.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ class Save extends Component {
} = this.props;

const { className } = this.props;
const { anchor } = this.props.attributes;

return (
<div className={classnames(className, {
'has-icon-left': iconPosition === 'left',
},
align ? `align${align}` : null
)}
id={anchor}
data-active-element={active != undefined ? active : 'none' }
>
<InnerBlocks.Content/>
Expand All @@ -42,4 +44,4 @@ class Save extends Component {
}
}

export default Save;
export default Save;
2 changes: 1 addition & 1 deletion src/blocks/toggle/toggle-item/attributes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ const attributes = {
},
};

export default attributes;
export default attributes;
2 changes: 1 addition & 1 deletion src/blocks/toggle/toggle-item/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class ToggleItem extends Component {
<Inspector { ...{
...this.props,
} } key={ 'inspector' }/>
<div {...itemClass}>
<div {...itemClass} id={this.props.attributes.anchor}>
<div className={`wp-block-getwid-toggle__header-wrapper`} key='header'>
<Tag className={`wp-block-getwid-toggle__header`}>
<a href="#">
Expand Down
3 changes: 2 additions & 1 deletion src/blocks/toggle/toggle-item/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export default registerBlockType(
category: 'getwid-blocks',
parent: [ 'getwid/toggle' ],
supports: {
anchor: true,
multiple: true,
reusable: false,
html: false
Expand Down Expand Up @@ -57,4 +58,4 @@ export default registerBlockType(
}} />
)
}
);
);
5 changes: 3 additions & 2 deletions src/blocks/toggle/toggle-item/save.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Save extends Component {

render() {
const {className, baseClass} = this.props;
const {outerParent, title, active} = this.props.attributes;
const {outerParent, title, active, anchor} = this.props.attributes;

const Tag = outerParent ? outerParent.attributes.headerTag : 'span';
const iconOpen = outerParent ? outerParent.attributes.iconOpen : 'fas fa-minus';
Expand All @@ -30,6 +30,7 @@ class Save extends Component {
'is-active': active,
},
)}
id={anchor}
>
<div
className={`wp-block-getwid-toggle__header-wrapper`}
Expand Down Expand Up @@ -62,4 +63,4 @@ class Save extends Component {
}
}

export default Save;
export default Save;
2 changes: 1 addition & 1 deletion src/blocks/toggle/toggle/attributes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ const attributes = {
},
};

export default attributes;
export default attributes;
1 change: 1 addition & 0 deletions src/blocks/toggle/toggle/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ class Toggle extends Component {
className={classnames(className, {
'has-icon-left': iconPosition === 'left'
})}
id={this.props.attributes.anchor}
>
<Provider value={this}>
<InnerBlocks
Expand Down
1 change: 1 addition & 0 deletions src/blocks/toggle/toggle/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export default registerBlockType(
icon: <SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g><Path d="M0,0v6h24V0H0z M22,4H2V2h20V4z"/></g><g><Path d="M0,18v6h24v-6H0z M22,22H2v-2h20V22z"/></g><g><Path d="M0,8v8h24V8H0z M22,14H2v-4h20V14z"/></g></SVG>,
category: 'getwid-blocks',
supports: {
anchor: true,
align: [ 'wide', 'full' ],
inserter: !Getwid.disabled_blocks.includes(blockName)
},
Expand Down
4 changes: 3 additions & 1 deletion src/blocks/toggle/toggle/save.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,18 @@ class Save extends Component {
} = this.props;

const { className } = this.props;
const { anchor } = this.props.attributes;

return (
<div className={classnames(className, {
'has-icon-left': iconPosition === 'left',
})}
id={anchor}
>
<InnerBlocks.Content/>
</div>
);
}
}

export default Save;
export default Save;