Skip to content

Added new props #51

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added new props #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f48704
Added prop preserveAspectRatio
luisfrocha Oct 2, 2020
8b71368
- Added prop for preserveAspectRatio for HexGrid
luisfrocha Nov 10, 2020
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
20 changes: 15 additions & 5 deletions src/HexGrid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ import PropTypes from 'prop-types';

class HexGrid extends Component {
static propTypes = {
preserveAspectRatio: PropTypes.string,
width: PropTypes.oneOfType([
PropTypes.string.isRequired,
PropTypes.number.isRequired,
PropTypes.number.isRequired
]),
height: PropTypes.oneOfType([
PropTypes.string.isRequired,
PropTypes.number.isRequired,
PropTypes.number.isRequired
]),
viewBox: PropTypes.string,
children: PropTypes.node.isRequired
Expand All @@ -18,13 +19,22 @@ class HexGrid extends Component {
static defaultProps = {
width: 800,
height: 600,
viewBox: "-50 -50 100 100"
viewBox: "-50 -50 100 100",
preserveAspectRatio: "xMidYMid meet"
}

render() {
const { width, height, viewBox } = this.props
const { width, height, viewBox, preserveAspectRatio } = this.props
return (
<svg className="grid" width={width} height={height} viewBox={viewBox} version="1.1" xmlns="http://www.w3.org/2000/svg">
<svg
className="grid"
preserveAspectRatio={preserveAspectRatio}
width={width}
height={height}
viewBox={viewBox}
version="1.1"
xmlns="http://www.w3.org/2000/svg"
>
{this.props.children}
</svg>
);
Expand Down
11 changes: 6 additions & 5 deletions src/Pattern.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import HexUtils from './HexUtils';
import Point from './models/Point';

class Pattern extends Component {
static propTypes = {
id: PropTypes.string.isRequired,
link: PropTypes.string.isRequired,
size: PropTypes.object
size: PropTypes.object,
patternUnits: PropTypes.string
};
static defaultProps = {
size: new Point(10, 10)
size: new Point(10, 10),
patternUnits: 'objectBoundingBox'
};

render() {
const { id, link, size } = this.props;
const { id, link, size, patternUnits } = this.props;

return (
<defs>
<pattern id={id} patternUnits="objectBoundingBox" x={0} y={0} width={size.x} height={size.y}>
<pattern id={id} patternUnits={patternUnits} x={0} y={0} width={size.x} height={size.y}>
<image xlinkHref={link} x={0} y={0} width={size.x*2} height={size.y*2} />
</pattern>
</defs>
Expand Down