cb0ad15138
Replaces all icons with the [Phosphor icon set](https://phosphoricons.com/). To accomodate these icons this also touches general style of buttons, headings, and other containers of icons. I want to give a massive shout out to [Niléane](https://nileane.fr/@nileane) and her project [Tangerine UI](https://github.com/nileane/TangerineUI-for-Mastodon). Most of the icons/adjustments I’ve made are based on her choices and work. Reviewed-on: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/77 Contains: commit4cd78295ddAuthor: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 13:57:50 2025 +0200 [bugfix] increase contrast for spoiler link commit4594e776e0Author: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 13:48:05 2025 +0200 [bugfix] increase contrast for “secondary” in light mode Increase the contrast for icons, usernames, and some other places commit7db3518be7Author: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 13:39:36 2025 +0200 [bugfix] increase size of overlayed buttons …such as the hide sensitive content button commit3fd37bbfa5Author: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 13:29:22 2025 +0200 [bugfix] resize three dot menu next to user commit82a4b2b8d9Author: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 13:23:29 2025 +0200 [bugfix] use correct icon name commit470cb995f9Author: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 12:55:27 2025 +0200 [bugfix] add back translation for pin/unpin button https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/77#issuecomment-7718876 commit255b64c8f7Author: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 12:22:34 2025 +0200 [bugfix] restore title functionality for icons the `title`-attribute doesn’t work on `<SVG>`-elements. the way to do it is with a nested `<title>`-element. this adds this functionality commit9c25c362fbAuthor: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 11:54:44 2025 +0200 [bugfix] remove import of Icon This gave me an error yesterday i think, but seems fine now, so 🤷🏻♀️. From review: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/77#issuecomment-7719077 commit36065d03fbAuthor: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 10:43:02 2025 +0200 [docs] update changelog commit80cb9ef0c5Author: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 10:09:10 2025 +0200 [bugfix] first pass at deduping and sorting commit59beb08921Author: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 01:59:50 2025 +0200 fix lint issues commit3ffcdffdf1Author: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 01:53:24 2025 +0200 liint commitcda2a62ee5Author: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 01:46:50 2025 +0200 lint commit373b756e8aAuthor: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 00:55:35 2025 +0200 rename calls commitd53ca0d990Author: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 00:52:25 2025 +0200 rename icon components commit07a1e149e1Author: Zoë Bijl <code@moiety.me> Date: Tue Oct 14 00:45:21 2025 +0200 [feature] change _all_ remaining icons commit53fdc6b82fAuthor: Zoë Bijl <code@moiety.me> Date: Mon Oct 13 20:17:04 2025 +0200 [feature] change upload form icons commitd143b433b2Author: Zoë Bijl <code@moiety.me> Date: Mon Oct 13 13:56:27 2025 +0200 [bugfix] allow icon with badge to expand horizontally This allows it to contain more numbers / text. Getting double digit notifications for example. Or the follow request cap '40+' text. commitb737f07676Author: Zoë Bijl <code@moiety.me> Date: Mon Oct 13 13:46:13 2025 +0200 [bugfix] import correct component for “follow request” menu item commit03205b05a9Author: Zoë Bijl <code@moiety.me> Date: Mon Oct 13 13:07:40 2025 +0200 [feature] update follow request icons commit199db8b9afAuthor: Zoë Bijl <code@moiety.me> Date: Mon Oct 13 01:40:23 2025 +0200 [feature] change video player controls commit9fcbf23274Author: Zoë Bijl <code@moiety.me> Date: Sun Oct 12 14:07:37 2025 +0200 [feature] change unlisted status icon to an open padlock Custom made icon based on Phosphor. I flipped the “lock” bit so it’s easier to distinguish. commita359bf4ab1Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 17:30:10 2025 +0200 [build] add regex for stylelint/custom-property-pattern Example: https://regex101.com/r/eITX54/1 commit972624b360Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 15:52:28 2025 +0200 [build] edit custom-property-pattern commitcaf3c1e41aAuthor: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 15:46:05 2025 +0200 [bugfix] fix media modal icons commit3d2df89ab5Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 15:35:59 2025 +0200 [bugfix] correct notification filter bar colours commit36308a2234Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 15:30:48 2025 +0200 [bugfix] fix account search result styling commiteea1c0315bAuthor: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 15:30:17 2025 +0200 [bugfix] fix drawer colours commitc2140a4be1Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 15:29:37 2025 +0200 [bugfix] fix search styling commit22c7fc2491Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 15:28:48 2025 +0200 [feature] change icons to Phosphor commitf1eeb89908Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 14:23:29 2025 +0200 [bugfix] properly set colors for lightmode commit7138e11984Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 14:22:59 2025 +0200 [feature] use css variables for select component - Search field - Notifications filter bar/account post bar - Status prepend part ('x' boosted) - body background color commitb91f194012Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 13:58:45 2025 +0200 [bugfix] set font-weight on account portion of the display name commit49ebf988a4Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 12:16:41 2025 +0200 [chore] correct path to login.css commit6433626943Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 12:10:54 2025 +0200 [chore] fix lint issues commit9034a3d103Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 12:10:38 2025 +0200 [chore] update stylelint rules commit5d5325d067Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 12:02:52 2025 +0200 [bugfix] style `.gts-icon-with-badge` Fixes styling for the notification badge commitfbd22639d9Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 09:30:14 2025 +0200 icon badge style commit7f1c3fd388Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 09:03:07 2025 +0200 [chore] fix lint issues commit5e063da784Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 10 01:01:35 2025 +0200 [feature] change icon for “new list” button commitc22c8ea097Author: Zoë Bijl <code@moiety.me> Date: Thu Oct 9 23:50:28 2025 +0200 [chore] add debug style for `.fa` I want to remove all FontAwesome from the project. This will help find any that are left over. commitf236962403Author: Zoë Bijl <code@moiety.me> Date: Thu Oct 9 23:49:39 2025 +0200 [feature] change “local only” status icon commit94a1ec45c2Author: Zoë Bijl <code@moiety.me> Date: Thu Oct 9 23:31:42 2025 +0200 [bugfix] properly align account buttons commit7adcf93c80Author: Zoë Bijl <code@moiety.me> Date: Thu Oct 9 23:31:25 2025 +0200 [bugfix] set border radius on smaller screens commit8ad4c08069Author: Zoë Bijl <code@moiety.me> Date: Thu Oct 9 23:03:15 2025 +0200 [feature] remove icons from notification purge bar commit457c3c2910Author: Zoë Bijl <code@moiety.me> Date: Thu Oct 9 19:49:49 2025 +0200 [feature] change list edit buttons commit046be63ed6Author: Zoë Bijl <code@moiety.me> Date: Thu Oct 9 18:15:14 2025 +0200 [feature] update dismissible banner icon commit506e59034bAuthor: Zoë Bijl <code@moiety.me> Date: Thu Oct 9 15:08:15 2025 +0200 [feature] change header pin state/move icons commitd97df4b87fAuthor: Zoë Bijl <code@moiety.me> Date: Thu Oct 9 11:42:55 2025 +0200 [chore] fix lint:js errors commitb418204ae3Author: Zoë Bijl <code@moiety.me> Date: Thu Oct 9 09:50:37 2025 +0200 [chore] fix lint:js errors …related to the icons commit415b05d20aAuthor: Zoë Bijl <code@moiety.me> Date: Wed Oct 8 13:44:51 2025 +0200 [feature] replace column move icons commit14f119be65Author: Zoë Bijl <code@moiety.me> Date: Wed Oct 8 13:38:18 2025 +0200 [bugfix] hide overflow text commit6fb2dd73beAuthor: Zoë Bijl <code@moiety.me> Date: Wed Oct 8 12:05:25 2025 +0200 [feature] improve status-prepend display name hover state commitf8f0b403afAuthor: Zoë Bijl <code@moiety.me> Date: Wed Oct 8 11:55:57 2025 +0200 [bugfix] uncomment slim back button styles commit8b254ae288Author: Zoë Bijl <code@moiety.me> Date: Wed Oct 8 11:44:54 2025 +0200 [feature] refactor status styling This does a bunch of stuff: - split out status components into their own file - unify spacing within a status - outline all icons - neatly fade the overflow part of a username - add underlines to username links when appropriate - correctly size all icons in a status - restyle spoiler link (content warning button) commitebfbed0553Author: Zoë Bijl <code@moiety.me> Date: Wed Oct 8 11:40:18 2025 +0200 [feature] change content warning state icon commitf70946ef48Author: Zoë Bijl <code@moiety.me> Date: Wed Oct 8 11:26:22 2025 +0200 [bugfix] remove unnecessary `<span>` commit312b157581Author: Zoë Bijl <code@moiety.me> Date: Wed Oct 8 11:15:07 2025 +0200 [bugfix] correctly align status prepend commit2cd3a82fc7Author: Zoë Bijl <code@moiety.me> Date: Wed Oct 8 11:04:39 2025 +0200 [bugfix] set correct icon state in detailed status view This change was already made for the normal status view. It sets the icon to be filled when a status is boosted or favourited. Also forgoing the need for the Glitch checkmark. commite1c1325905Author: Zoë Bijl <code@moiety.me> Date: Wed Oct 8 11:02:58 2025 +0200 [feature] replace load-gap icon commitd483cab118Author: Zoë Bijl <code@moiety.me> Date: Wed Oct 8 11:00:05 2025 +0200 [feature] align `drawer` and `compose-panel` components - Neatly aligns both the `.drawer` and `.compose-panel` components - Fixes `.search__input` padding when inside the `.compose-panel` commit3c85b02b51Author: Zoë Bijl <code@moiety.me> Date: Wed Oct 8 10:52:37 2025 +0200 [feature] add “sizes” variables file commit7a4b9c6634Author: Zoë Bijl <code@moiety.me> Date: Tue Oct 7 17:26:30 2025 +0200 [feature] space out status action bar items commitebfd05be3dAuthor: Zoë Bijl <code@moiety.me> Date: Tue Oct 7 17:25:49 2025 +0200 [bugfix] remove “sticky” background on focus commita977011b34Author: Zoë Bijl <code@moiety.me> Date: Tue Oct 7 17:24:52 2025 +0200 [feature] refactor status prepend box commit52fbda27edAuthor: Zoë Bijl <code@moiety.me> Date: Tue Oct 7 17:20:44 2025 +0200 [feature] add GTS specific CSS provides a space to place rewritten CSS; should help keep track of what has been done. commit7209169ba9Author: Zoë Bijl <code@moiety.me> Date: Mon Oct 6 13:02:02 2025 +0200 [feature] add animations to status bar icons When activated the status bar (under a toot) icons now do a cute lil animation, courtesy of Tangerine UI. commitc0ea21299fAuthor: Zoë Bijl <code@moiety.me> Date: Sun Oct 5 01:36:12 2025 +0200 [feature] refactor search box / add drawer outlines - add outlines to some UI elements like the timeline and drawers - search “clear” button is now an actual `<button>` commit82cc610ab7Author: Zoë Bijl <code@moiety.me> Date: Sat Oct 4 20:34:17 2025 +0200 [feature] set icons for lists commit004404dc83Author: Zoë Bijl <code@moiety.me> Date: Sat Oct 4 20:33:39 2025 +0200 [feature] refactor local settings navigation item commit9dbc200fd6Author: Zoë Bijl <code@moiety.me> Date: Sat Oct 4 20:32:27 2025 +0200 [feature] refactor column/drawer header commitbeb7a68b5eAuthor: Zoë Bijl <code@moiety.me> Date: Sat Oct 4 20:30:29 2025 +0200 [fix] set correct icon size for action-bar commit6fb994abe6Author: Zoë Bijl <code@moiety.me> Date: Sat Oct 4 20:29:35 2025 +0200 [feature] refactor notifications filter bar commitefaeb5d969Author: Zoë Bijl <code@moiety.me> Date: Sat Oct 4 01:25:42 2025 +0200 [refactor] compose form button bar CSS Complete rewrite of the CSS for the compose form button bar. This makes the buttons and icons sit nicely in the available space. commit18fd2ef39aAuthor: Zoë Bijl <code@moiety.me> Date: Sat Oct 4 01:14:03 2025 +0200 [feat] change unlisted icon from lock to moon Makes easier to distinguish. commit5e16246d56Author: Zoë Bijl <code@moiety.me> Date: Sat Oct 4 01:00:54 2025 +0200 [fix] use `<button>` for emoji button No idea why this was a `<div>`; this works fine in my testing. commit250b415a9dAuthor: Zoë Bijl <code@moiety.me> Date: Sat Oct 4 00:58:16 2025 +0200 [fix] remove inline styling for icon button commitea3106c635Author: Zoë Bijl <code@moiety.me> Date: Fri Oct 3 23:11:38 2025 +0200 [feature] set toot footer icons based on state When you favourite, boost, or bookmark a toot the icons turns into a filled version. commit5a6fd18ec2Author: Zoë Bijl <code@moiety.me> Date: Wed Oct 1 23:48:22 2025 +0200 [feature] add SVG icons commitb62c1f4fc6Author: Zoë Bijl <code@moiety.me> Date: Wed Oct 1 00:56:51 2025 +0200 [feature] add SVG icons # Conflicts: # .editorconfig # Conflicts: # app/javascript/flavours/glitch/components/account.jsx # app/javascript/flavours/glitch/components/column_back_button.jsx # app/javascript/flavours/glitch/components/column_back_button_slim.jsx # app/javascript/flavours/glitch/components/column_header.jsx # app/javascript/flavours/glitch/components/dropdown_menu.jsx # app/javascript/flavours/glitch/components/media_gallery.jsx # app/javascript/flavours/glitch/components/status.jsx # app/javascript/flavours/glitch/components/status_action_bar.jsx # app/javascript/flavours/glitch/components/status_icons.jsx # app/javascript/flavours/glitch/components/status_prepend.jsx # app/javascript/flavours/glitch/components/status_visibility_icon.jsx # app/javascript/flavours/glitch/features/account/components/header.jsx # app/javascript/flavours/glitch/features/audio/index.jsx # app/javascript/flavours/glitch/features/compose/components/dropdown.jsx # app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx # app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx # app/javascript/flavours/glitch/features/compose/components/header.jsx # app/javascript/flavours/glitch/features/compose/components/options.jsx # app/javascript/flavours/glitch/features/compose/components/poll_form.jsx # app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx # app/javascript/flavours/glitch/features/compose/components/publisher.jsx # app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx # app/javascript/flavours/glitch/features/compose/components/search.jsx # app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx # app/javascript/flavours/glitch/features/favourites/index.jsx # app/javascript/flavours/glitch/features/getting_started/index.jsx # app/javascript/flavours/glitch/features/interaction_modal/index.jsx # app/javascript/flavours/glitch/features/local_settings/navigation/item/index.jsx # app/javascript/flavours/glitch/features/notifications/components/admin_report.jsx # app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx # app/javascript/flavours/glitch/features/notifications/components/clear_column_button.jsx # app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx # app/javascript/flavours/glitch/features/notifications/components/follow.jsx # app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx # app/javascript/flavours/glitch/features/notifications/index.jsx # app/javascript/flavours/glitch/features/picture_in_picture/components/footer.jsx # app/javascript/flavours/glitch/features/reblogs/index.jsx # app/javascript/flavours/glitch/features/status/components/action_bar.jsx # app/javascript/flavours/glitch/features/status/components/detailed_status.jsx # app/javascript/flavours/glitch/features/status/index.jsx # app/javascript/flavours/glitch/features/ui/components/column_header.jsx # app/javascript/flavours/glitch/features/ui/components/column_link.jsx # app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx # app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx # app/javascript/flavours/glitch/features/ui/components/filter_modal.jsx # app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx # app/javascript/flavours/glitch/features/ui/components/image_modal.jsx # app/javascript/flavours/glitch/features/ui/components/media_modal.jsx # app/javascript/flavours/glitch/features/ui/components/notifications_counter_icon.js # app/javascript/flavours/glitch/features/ui/components/report_modal.jsx
467 lines
14 KiB
React
467 lines
14 KiB
React
import PropTypes from "prop-types";
|
|
import { PureComponent } from "react";
|
|
|
|
import { defineMessages, injectIntl } from "react-intl";
|
|
|
|
import { IconButton } from "flavours/glitch/components/icon_button";
|
|
|
|
const messages = defineMessages({
|
|
compress: { id: "lightbox.compress", defaultMessage: "Compress image view box" },
|
|
expand: { id: "lightbox.expand", defaultMessage: "Expand image view box" },
|
|
});
|
|
|
|
const MIN_SCALE = 1;
|
|
const MAX_SCALE = 4;
|
|
const NAV_BAR_HEIGHT = 66;
|
|
|
|
const getMidpoint = (p1, p2) => ({
|
|
x: (p1.clientX + p2.clientX) / 2,
|
|
y: (p1.clientY + p2.clientY) / 2,
|
|
});
|
|
|
|
const getDistance = (p1, p2) =>
|
|
Math.sqrt(Math.pow(p1.clientX - p2.clientX, 2) + Math.pow(p1.clientY - p2.clientY, 2));
|
|
|
|
const clamp = (min, max, value) => Math.min(max, Math.max(min, value));
|
|
|
|
// Normalizing mousewheel speed across browsers
|
|
// copy from: https://github.com/facebookarchive/fixed-data-table/blob/master/src/vendor_upstream/dom/normalizeWheel.js
|
|
const normalizeWheel = event => {
|
|
// Reasonable defaults
|
|
const PIXEL_STEP = 10;
|
|
const LINE_HEIGHT = 40;
|
|
const PAGE_HEIGHT = 800;
|
|
|
|
let sX = 0,
|
|
sY = 0, // spinX, spinY
|
|
pX = 0,
|
|
pY = 0; // pixelX, pixelY
|
|
|
|
// Legacy
|
|
if ("detail" in event) {
|
|
sY = event.detail;
|
|
}
|
|
if ("wheelDelta" in event) {
|
|
sY = -event.wheelDelta / 120;
|
|
}
|
|
if ("wheelDeltaY" in event) {
|
|
sY = -event.wheelDeltaY / 120;
|
|
}
|
|
if ("wheelDeltaX" in event) {
|
|
sX = -event.wheelDeltaX / 120;
|
|
}
|
|
|
|
// side scrolling on FF with DOMMouseScroll
|
|
if ("axis" in event && event.axis === event.HORIZONTAL_AXIS) {
|
|
sX = sY;
|
|
sY = 0;
|
|
}
|
|
|
|
pX = sX * PIXEL_STEP;
|
|
pY = sY * PIXEL_STEP;
|
|
|
|
if ("deltaY" in event) {
|
|
pY = event.deltaY;
|
|
}
|
|
if ("deltaX" in event) {
|
|
pX = event.deltaX;
|
|
}
|
|
|
|
if ((pX || pY) && event.deltaMode) {
|
|
if (event.deltaMode === 1) { // delta in LINE units
|
|
pX *= LINE_HEIGHT;
|
|
pY *= LINE_HEIGHT;
|
|
} else { // delta in PAGE units
|
|
pX *= PAGE_HEIGHT;
|
|
pY *= PAGE_HEIGHT;
|
|
}
|
|
}
|
|
|
|
// Fall-back if spin cannot be determined
|
|
if (pX && !sX) {
|
|
sX = (pX < 1) ? -1 : 1;
|
|
}
|
|
if (pY && !sY) {
|
|
sY = (pY < 1) ? -1 : 1;
|
|
}
|
|
|
|
return {
|
|
spinX: sX,
|
|
spinY: sY,
|
|
pixelX: pX,
|
|
pixelY: pY,
|
|
};
|
|
};
|
|
|
|
class ZoomableImage extends PureComponent {
|
|
|
|
static propTypes = {
|
|
alt: PropTypes.string,
|
|
lang: PropTypes.string,
|
|
src: PropTypes.string.isRequired,
|
|
width: PropTypes.number,
|
|
height: PropTypes.number,
|
|
onClick: PropTypes.func,
|
|
zoomButtonHidden: PropTypes.bool,
|
|
intl: PropTypes.object.isRequired,
|
|
};
|
|
|
|
static defaultProps = {
|
|
alt: "",
|
|
lang: "",
|
|
width: null,
|
|
height: null,
|
|
};
|
|
|
|
state = {
|
|
scale: MIN_SCALE,
|
|
zoomMatrix: {
|
|
type: null, // 'width' 'height'
|
|
fullScreen: null, // bool
|
|
rate: null, // full screen scale rate
|
|
clientWidth: null,
|
|
clientHeight: null,
|
|
offsetWidth: null,
|
|
offsetHeight: null,
|
|
clientHeightFixed: null,
|
|
scrollTop: null,
|
|
scrollLeft: null,
|
|
translateX: null,
|
|
translateY: null,
|
|
},
|
|
zoomState: "expand", // 'expand' 'compress'
|
|
navigationHidden: false,
|
|
dragPosition: { top: 0, left: 0, x: 0, y: 0 },
|
|
dragged: false,
|
|
lockScroll: { x: 0, y: 0 },
|
|
lockTranslate: { x: 0, y: 0 },
|
|
};
|
|
|
|
removers = [];
|
|
container = null;
|
|
image = null;
|
|
lastTouchEndTime = 0;
|
|
lastDistance = 0;
|
|
|
|
componentDidMount () {
|
|
let handler = this.handleTouchStart;
|
|
this.container.addEventListener("touchstart", handler);
|
|
this.removers.push(() => this.container.removeEventListener("touchstart", handler));
|
|
handler = this.handleTouchMove;
|
|
// on Chrome 56+, touch event listeners will default to passive
|
|
// https://www.chromestatus.com/features/5093566007214080
|
|
this.container.addEventListener("touchmove", handler, { passive: false });
|
|
this.removers.push(() => this.container.removeEventListener("touchend", handler));
|
|
|
|
handler = this.mouseDownHandler;
|
|
this.container.addEventListener("mousedown", handler);
|
|
this.removers.push(() => this.container.removeEventListener("mousedown", handler));
|
|
|
|
handler = this.mouseWheelHandler;
|
|
this.container.addEventListener("wheel", handler);
|
|
this.removers.push(() => this.container.removeEventListener("wheel", handler));
|
|
// Old Chrome
|
|
this.container.addEventListener("mousewheel", handler);
|
|
this.removers.push(() => this.container.removeEventListener("mousewheel", handler));
|
|
// Old Firefox
|
|
this.container.addEventListener("DOMMouseScroll", handler);
|
|
this.removers.push(() => this.container.removeEventListener("DOMMouseScroll", handler));
|
|
|
|
this.initZoomMatrix();
|
|
}
|
|
|
|
componentWillUnmount () {
|
|
this.removeEventListeners();
|
|
}
|
|
|
|
componentDidUpdate () {
|
|
this.setState({ zoomState: this.state.scale >= this.state.zoomMatrix.rate ? "compress" : "expand" });
|
|
|
|
if (this.state.scale === MIN_SCALE) {
|
|
this.container.style.removeProperty("cursor");
|
|
}
|
|
}
|
|
|
|
UNSAFE_componentWillReceiveProps () {
|
|
// reset when slide to next image
|
|
if (this.props.zoomButtonHidden) {
|
|
this.setState({
|
|
scale: MIN_SCALE,
|
|
lockTranslate: { x: 0, y: 0 },
|
|
}, () => {
|
|
this.container.scrollLeft = 0;
|
|
this.container.scrollTop = 0;
|
|
});
|
|
}
|
|
}
|
|
|
|
removeEventListeners () {
|
|
this.removers.forEach(listeners => listeners());
|
|
this.removers = [];
|
|
}
|
|
|
|
mouseWheelHandler = e => {
|
|
e.preventDefault();
|
|
|
|
const event = normalizeWheel(e);
|
|
|
|
if (this.state.zoomMatrix.type === "width") {
|
|
// full width, scroll vertical
|
|
this.container.scrollTop = Math.max(this.container.scrollTop + event.pixelY, this.state.lockScroll.y);
|
|
} else {
|
|
// full height, scroll horizontal
|
|
this.container.scrollLeft = Math.max(this.container.scrollLeft + event.pixelY, this.state.lockScroll.x);
|
|
}
|
|
|
|
// lock horizontal scroll
|
|
this.container.scrollLeft = Math.max(this.container.scrollLeft + event.pixelX, this.state.lockScroll.x);
|
|
};
|
|
|
|
mouseDownHandler = e => {
|
|
this.container.style.cursor = "grabbing";
|
|
this.container.style.userSelect = "none";
|
|
|
|
this.setState({ dragPosition: {
|
|
left: this.container.scrollLeft,
|
|
top: this.container.scrollTop,
|
|
// Get the current mouse position
|
|
x: e.clientX,
|
|
y: e.clientY,
|
|
} });
|
|
|
|
this.image.addEventListener("mousemove", this.mouseMoveHandler);
|
|
this.image.addEventListener("mouseup", this.mouseUpHandler);
|
|
};
|
|
|
|
mouseMoveHandler = e => {
|
|
const dx = e.clientX - this.state.dragPosition.x;
|
|
const dy = e.clientY - this.state.dragPosition.y;
|
|
|
|
this.container.scrollLeft = Math.max(this.state.dragPosition.left - dx, this.state.lockScroll.x);
|
|
this.container.scrollTop = Math.max(this.state.dragPosition.top - dy, this.state.lockScroll.y);
|
|
|
|
this.setState({ dragged: true });
|
|
};
|
|
|
|
mouseUpHandler = () => {
|
|
this.container.style.cursor = "grab";
|
|
this.container.style.removeProperty("user-select");
|
|
|
|
this.image.removeEventListener("mousemove", this.mouseMoveHandler);
|
|
this.image.removeEventListener("mouseup", this.mouseUpHandler);
|
|
};
|
|
|
|
handleTouchStart = e => {
|
|
if (e.touches.length !== 2) {
|
|
return;
|
|
}
|
|
|
|
this.lastDistance = getDistance(...e.touches);
|
|
};
|
|
|
|
handleTouchMove = e => {
|
|
const { scrollTop, scrollHeight, clientHeight } = this.container;
|
|
if (e.touches.length === 1 && scrollTop !== scrollHeight - clientHeight) {
|
|
// prevent propagating event to MediaModal
|
|
e.stopPropagation();
|
|
return;
|
|
}
|
|
if (e.touches.length !== 2) {
|
|
return;
|
|
}
|
|
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
|
|
const distance = getDistance(...e.touches);
|
|
const midpoint = getMidpoint(...e.touches);
|
|
const _MAX_SCALE = Math.max(MAX_SCALE, this.state.zoomMatrix.rate);
|
|
const scale = clamp(MIN_SCALE, _MAX_SCALE, this.state.scale * distance / this.lastDistance);
|
|
|
|
this.zoom(scale, midpoint);
|
|
|
|
this.lastMidpoint = midpoint;
|
|
this.lastDistance = distance;
|
|
};
|
|
|
|
zoom(nextScale, midpoint) {
|
|
const { scale, zoomMatrix } = this.state;
|
|
const { scrollLeft, scrollTop } = this.container;
|
|
|
|
// math memo:
|
|
// x = (scrollLeft + midpoint.x) / scrollWidth
|
|
// x' = (nextScrollLeft + midpoint.x) / nextScrollWidth
|
|
// scrollWidth = clientWidth * scale
|
|
// scrollWidth' = clientWidth * nextScale
|
|
// Solve x = x' for nextScrollLeft
|
|
const nextScrollLeft = (scrollLeft + midpoint.x) * nextScale / scale - midpoint.x;
|
|
const nextScrollTop = (scrollTop + midpoint.y) * nextScale / scale - midpoint.y;
|
|
|
|
this.setState({ scale: nextScale }, () => {
|
|
this.container.scrollLeft = nextScrollLeft;
|
|
this.container.scrollTop = nextScrollTop;
|
|
// reset the translateX/Y constantly
|
|
if (nextScale < zoomMatrix.rate) {
|
|
this.setState({
|
|
lockTranslate: {
|
|
x: zoomMatrix.fullScreen ? 0 : zoomMatrix.translateX * ((nextScale - MIN_SCALE) / (zoomMatrix.rate - MIN_SCALE)),
|
|
y: zoomMatrix.fullScreen ? 0 : zoomMatrix.translateY * ((nextScale - MIN_SCALE) / (zoomMatrix.rate - MIN_SCALE)),
|
|
},
|
|
});
|
|
}
|
|
});
|
|
}
|
|
|
|
handleClick = e => {
|
|
// don't propagate event to MediaModal
|
|
e.stopPropagation();
|
|
const dragged = this.state.dragged;
|
|
this.setState({ dragged: false });
|
|
if (dragged) {
|
|
return;
|
|
}
|
|
const handler = this.props.onClick;
|
|
if (handler) {
|
|
handler();
|
|
}
|
|
this.setState({ navigationHidden: !this.state.navigationHidden });
|
|
};
|
|
|
|
handleMouseDown = e => {
|
|
e.preventDefault();
|
|
};
|
|
|
|
initZoomMatrix = () => {
|
|
const { width, height } = this.props;
|
|
const { clientWidth, clientHeight } = this.container;
|
|
const { offsetWidth, offsetHeight } = this.image;
|
|
const clientHeightFixed = clientHeight - NAV_BAR_HEIGHT;
|
|
|
|
const type = width / height < clientWidth / clientHeightFixed ? "width" : "height";
|
|
const fullScreen = type === "width" ? width > clientWidth : height > clientHeightFixed;
|
|
const rate = type === "width" ? Math.min(clientWidth, width) / offsetWidth : Math.min(clientHeightFixed, height) / offsetHeight;
|
|
const scrollTop = type === "width" ? (clientHeight - offsetHeight) / 2 - NAV_BAR_HEIGHT : (clientHeightFixed - offsetHeight) / 2;
|
|
const scrollLeft = (clientWidth - offsetWidth) / 2;
|
|
const translateX = type === "width" ? (width - offsetWidth) / (2 * rate) : 0;
|
|
const translateY = type === "height" ? (height - offsetHeight) / (2 * rate) : 0;
|
|
|
|
this.setState({
|
|
zoomMatrix: {
|
|
type: type,
|
|
fullScreen: fullScreen,
|
|
rate: rate,
|
|
clientWidth: clientWidth,
|
|
clientHeight: clientHeight,
|
|
offsetWidth: offsetWidth,
|
|
offsetHeight: offsetHeight,
|
|
clientHeightFixed: clientHeightFixed,
|
|
scrollTop: scrollTop,
|
|
scrollLeft: scrollLeft,
|
|
translateX: translateX,
|
|
translateY: translateY,
|
|
},
|
|
});
|
|
};
|
|
|
|
handleZoomClick = e => {
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
|
|
const { scale, zoomMatrix } = this.state;
|
|
|
|
if ( scale >= zoomMatrix.rate ) {
|
|
this.setState({
|
|
scale: MIN_SCALE,
|
|
lockScroll: {
|
|
x: 0,
|
|
y: 0,
|
|
},
|
|
lockTranslate: {
|
|
x: 0,
|
|
y: 0,
|
|
},
|
|
}, () => {
|
|
this.container.scrollLeft = 0;
|
|
this.container.scrollTop = 0;
|
|
});
|
|
} else {
|
|
this.setState({
|
|
scale: zoomMatrix.rate,
|
|
lockScroll: {
|
|
x: zoomMatrix.scrollLeft,
|
|
y: zoomMatrix.scrollTop,
|
|
},
|
|
lockTranslate: {
|
|
x: zoomMatrix.fullScreen ? 0 : zoomMatrix.translateX,
|
|
y: zoomMatrix.fullScreen ? 0 : zoomMatrix.translateY,
|
|
},
|
|
}, () => {
|
|
this.container.scrollLeft = zoomMatrix.scrollLeft;
|
|
this.container.scrollTop = zoomMatrix.scrollTop;
|
|
});
|
|
}
|
|
|
|
this.container.style.cursor = "grab";
|
|
this.container.style.removeProperty("user-select");
|
|
};
|
|
|
|
setContainerRef = c => {
|
|
this.container = c;
|
|
};
|
|
|
|
setImageRef = c => {
|
|
this.image = c;
|
|
};
|
|
|
|
render () {
|
|
const { alt, lang, src, width, height, intl } = this.props;
|
|
const { scale, lockTranslate } = this.state;
|
|
const overflow = scale === MIN_SCALE ? "hidden" : "scroll";
|
|
const zoomButtonShouldHide = this.state.navigationHidden || this.props.zoomButtonHidden || this.state.zoomMatrix.rate <= MIN_SCALE ? "media-modal__zoom-button--hidden" : "";
|
|
const zoomButtonTitle = this.state.zoomState === "compress" ? intl.formatMessage(messages.compress) : intl.formatMessage(messages.expand);
|
|
|
|
const zoomButtonIcon = this.state.zoomState === "compress" ? "arrows-in-simple" : "arrows-out-simple";
|
|
|
|
return (
|
|
<>
|
|
<IconButton
|
|
className={`media-modal__zoom-button ${zoomButtonShouldHide}`}
|
|
title={zoomButtonTitle}
|
|
icon={zoomButtonIcon}
|
|
onClick={this.handleZoomClick}
|
|
size={40}
|
|
style={{
|
|
fontSize: "30px", /* Fontawesome's fa-compress fa-expand is larger than fa-close */
|
|
}}
|
|
/>
|
|
<div
|
|
className='zoomable-image'
|
|
ref={this.setContainerRef}
|
|
style={{ overflow }}
|
|
>
|
|
<img
|
|
role='presentation'
|
|
ref={this.setImageRef}
|
|
alt={alt}
|
|
title={alt}
|
|
lang={lang}
|
|
src={src}
|
|
width={width}
|
|
height={height}
|
|
style={{
|
|
transform: `scale(${scale}) translate(-${lockTranslate.x}px, -${lockTranslate.y}px)`,
|
|
transformOrigin: "0 0",
|
|
}}
|
|
draggable={false}
|
|
onClick={this.handleClick}
|
|
onMouseDown={this.handleMouseDown}
|
|
/>
|
|
</div>
|
|
</>
|
|
);
|
|
}
|
|
|
|
}
|
|
|
|
export default injectIntl(ZoomableImage);
|