Fix double border on custom feed posts (web)
Add missing visibility check for ageAssuranceBanner on non-discover feeds. The banner was being added to the feedItems array without checking ageAssuranceBannerState.visible, causing the first post's rowIndex to be 1 instead of 0, which prevented hideTopBorder from being set correctly. This was particularly visible on web when directly navigating to a custom feed URL.
This commit is contained in:
Claude
@@ -0,0 +1,6 @@
|
||||
export var BottomSheetSnapPoint;
|
||||
(function (BottomSheetSnapPoint) {
|
||||
BottomSheetSnapPoint[BottomSheetSnapPoint["Hidden"] = 0] = "Hidden";
|
||||
BottomSheetSnapPoint[BottomSheetSnapPoint["Partial"] = 1] = "Partial";
|
||||
BottomSheetSnapPoint[BottomSheetSnapPoint["Full"] = 2] = "Full";
|
||||
})(BottomSheetSnapPoint || (BottomSheetSnapPoint = {}));
|
||||
@@ -0,0 +1,195 @@
|
||||
var __extends = (this && this.__extends) || (function () {
|
||||
var extendStatics = function (d, b) {
|
||||
extendStatics = Object.setPrototypeOf ||
|
||||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
||||
function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
|
||||
return extendStatics(d, b);
|
||||
};
|
||||
return function (d, b) {
|
||||
if (typeof b !== "function" && b !== null)
|
||||
throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
|
||||
extendStatics(d, b);
|
||||
function __() { this.constructor = d; }
|
||||
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
||||
};
|
||||
})();
|
||||
var __assign = (this && this.__assign) || function () {
|
||||
__assign = Object.assign || function(t) {
|
||||
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
||||
s = arguments[i];
|
||||
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
||||
t[p] = s[p];
|
||||
}
|
||||
return t;
|
||||
};
|
||||
return __assign.apply(this, arguments);
|
||||
};
|
||||
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
||||
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
||||
return new (P || (P = Promise))(function (resolve, reject) {
|
||||
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
||||
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
||||
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
||||
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
||||
});
|
||||
};
|
||||
var __generator = (this && this.__generator) || function (thisArg, body) {
|
||||
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
||||
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
||||
function verb(n) { return function (v) { return step([n, v]); }; }
|
||||
function step(op) {
|
||||
if (f) throw new TypeError("Generator is already executing.");
|
||||
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
||||
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
||||
if (y = 0, t) op = [op[0] & 2, t.value];
|
||||
switch (op[0]) {
|
||||
case 0: case 1: t = op; break;
|
||||
case 4: _.label++; return { value: op[1], done: false };
|
||||
case 5: _.label++; y = op[1]; op = [0]; continue;
|
||||
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
||||
default:
|
||||
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
||||
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
||||
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
||||
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
||||
if (t[2]) _.ops.pop();
|
||||
_.trys.pop(); continue;
|
||||
}
|
||||
op = body.call(thisArg, _);
|
||||
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
||||
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
||||
}
|
||||
};
|
||||
var __rest = (this && this.__rest) || function (s, e) {
|
||||
var t = {};
|
||||
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
||||
t[p] = s[p];
|
||||
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
||||
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
||||
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
||||
t[p[i]] = s[p[i]];
|
||||
}
|
||||
return t;
|
||||
};
|
||||
import { jsx as _jsx } from "react/jsx-runtime";
|
||||
import * as React from 'react';
|
||||
import { Dimensions, Platform, View, } from 'react-native';
|
||||
import { useSafeAreaInsets } from 'react-native-safe-area-context';
|
||||
import { requireNativeModule, requireNativeViewManager } from 'expo-modules-core';
|
||||
import { IS_IOS } from '#/env';
|
||||
import { BottomSheetPortalProvider } from './BottomSheetPortal';
|
||||
import { Context as PortalContext } from './BottomSheetPortal';
|
||||
var screenHeight = Dimensions.get('screen').height;
|
||||
var NativeView = requireNativeViewManager('BottomSheet');
|
||||
var NativeModule = requireNativeModule('BottomSheet');
|
||||
var IS_IOS15 = Platform.OS === 'ios' &&
|
||||
// semvar - can be 3 segments, so can't use Number(Platform.Version)
|
||||
Number(Platform.Version.split('.').at(0)) < 16;
|
||||
var BottomSheetNativeComponent = /** @class */ (function (_super) {
|
||||
__extends(BottomSheetNativeComponent, _super);
|
||||
function BottomSheetNativeComponent(props) {
|
||||
var _this = _super.call(this, props) || this;
|
||||
_this.ref = React.createRef();
|
||||
_this.onStateChange = function (event) {
|
||||
var _b, _c;
|
||||
var state = event.nativeEvent.state;
|
||||
var isOpen = state !== 'closed';
|
||||
_this.setState({ open: isOpen });
|
||||
(_c = (_b = _this.props).onStateChange) === null || _c === void 0 ? void 0 : _c.call(_b, event);
|
||||
};
|
||||
_this.updateLayout = function () {
|
||||
var _b;
|
||||
(_b = _this.ref.current) === null || _b === void 0 ? void 0 : _b.updateLayout();
|
||||
};
|
||||
_this.state = {
|
||||
open: false,
|
||||
};
|
||||
return _this;
|
||||
}
|
||||
BottomSheetNativeComponent.prototype.present = function () {
|
||||
this.setState({ open: true });
|
||||
};
|
||||
BottomSheetNativeComponent.prototype.dismiss = function () {
|
||||
var _b;
|
||||
(_b = this.ref.current) === null || _b === void 0 ? void 0 : _b.dismiss();
|
||||
};
|
||||
BottomSheetNativeComponent.prototype.render = function () {
|
||||
var _this = this;
|
||||
var _b;
|
||||
var Portal = this.context;
|
||||
if (!Portal) {
|
||||
throw new Error('BottomSheet: You need to wrap your component tree with a <BottomSheetPortalProvider> to use the bottom sheet.');
|
||||
}
|
||||
if (!this.state.open) {
|
||||
return null;
|
||||
}
|
||||
var extraStyles;
|
||||
if (IS_IOS15 && this.state.viewHeight) {
|
||||
var viewHeight = this.state.viewHeight;
|
||||
var cornerRadius = (_b = this.props.cornerRadius) !== null && _b !== void 0 ? _b : 0;
|
||||
if (viewHeight < screenHeight / 2) {
|
||||
extraStyles = {
|
||||
height: viewHeight,
|
||||
marginTop: screenHeight / 2 - viewHeight,
|
||||
borderTopLeftRadius: cornerRadius,
|
||||
borderTopRightRadius: cornerRadius,
|
||||
};
|
||||
}
|
||||
}
|
||||
return (_jsx(Portal, { children: _jsx(BottomSheetNativeComponentInner, __assign({}, this.props, { nativeViewRef: this.ref, onStateChange: this.onStateChange, extraStyles: extraStyles, onLayout: function (e) {
|
||||
if (IS_IOS15) {
|
||||
var height = e.nativeEvent.layout.height;
|
||||
_this.setState({ viewHeight: height });
|
||||
}
|
||||
if (Platform.OS === 'android') {
|
||||
// TEMP HACKFIX: I had to timebox this, but this is Bad.
|
||||
// On Android, if you run updateLayout() immediately,
|
||||
// it will take ages to actually run on the native side.
|
||||
// However, adding literally any delay will fix this, including
|
||||
// a console.log() - just sending the log to the CLI is enough.
|
||||
// TODO: Get to the bottom of this and fix it properly! -sfn
|
||||
setTimeout(function () { return _this.updateLayout(); });
|
||||
}
|
||||
else {
|
||||
_this.updateLayout();
|
||||
}
|
||||
} })) }));
|
||||
};
|
||||
var _a;
|
||||
_a = BottomSheetNativeComponent;
|
||||
BottomSheetNativeComponent.contextType = PortalContext;
|
||||
BottomSheetNativeComponent.dismissAll = function () { return __awaiter(void 0, void 0, void 0, function () {
|
||||
return __generator(_a, function (_b) {
|
||||
switch (_b.label) {
|
||||
case 0: return [4 /*yield*/, NativeModule.dismissAll()];
|
||||
case 1:
|
||||
_b.sent();
|
||||
return [2 /*return*/];
|
||||
}
|
||||
});
|
||||
}); };
|
||||
return BottomSheetNativeComponent;
|
||||
}(React.Component));
|
||||
export { BottomSheetNativeComponent };
|
||||
function BottomSheetNativeComponentInner(_b) {
|
||||
var _c;
|
||||
var children = _b.children, backgroundColor = _b.backgroundColor, onLayout = _b.onLayout, onStateChange = _b.onStateChange, nativeViewRef = _b.nativeViewRef, extraStyles = _b.extraStyles, rest = __rest(_b, ["children", "backgroundColor", "onLayout", "onStateChange", "nativeViewRef", "extraStyles"]);
|
||||
var insets = useSafeAreaInsets();
|
||||
var cornerRadius = (_c = rest.cornerRadius) !== null && _c !== void 0 ? _c : 0;
|
||||
var sheetHeight = IS_IOS ? screenHeight - insets.top : screenHeight;
|
||||
return (_jsx(NativeView, __assign({}, rest, { onStateChange: onStateChange, ref: nativeViewRef, style: {
|
||||
position: 'absolute',
|
||||
height: sheetHeight,
|
||||
width: '100%',
|
||||
}, containerBackgroundColor: backgroundColor, children: _jsx(View, { style: [
|
||||
{
|
||||
flex: 1,
|
||||
backgroundColor: backgroundColor,
|
||||
},
|
||||
Platform.OS === 'android' && {
|
||||
borderTopLeftRadius: cornerRadius,
|
||||
borderTopRightRadius: cornerRadius,
|
||||
},
|
||||
extraStyles,
|
||||
], children: _jsx(View, { onLayout: onLayout, children: _jsx(BottomSheetPortalProvider, { children: children }) }) }) })));
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
||||
import React from 'react';
|
||||
import { createPortalGroup_INTERNAL } from './lib/Portal';
|
||||
export var Context = React.createContext({});
|
||||
Context.displayName = 'BottomSheetPortalContext';
|
||||
export var useBottomSheetPortal_INTERNAL = function () { return React.useContext(Context); };
|
||||
export function BottomSheetPortalProvider(_a) {
|
||||
var children = _a.children;
|
||||
var portal = React.useMemo(function () {
|
||||
return createPortalGroup_INTERNAL();
|
||||
}, []);
|
||||
return (_jsx(Context.Provider, { value: portal.Portal, children: _jsxs(portal.Provider, { children: [children, _jsx(portal.Outlet, {})] }) }));
|
||||
}
|
||||
var defaultPortal = createPortalGroup_INTERNAL();
|
||||
export var BottomSheetOutlet = defaultPortal.Outlet;
|
||||
export function BottomSheetProvider(_a) {
|
||||
var children = _a.children;
|
||||
return (_jsx(Context.Provider, { value: defaultPortal.Portal, children: _jsx(defaultPortal.Provider, { children: children }) }));
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
||||
import React from 'react';
|
||||
export function createPortalGroup_INTERNAL() {
|
||||
var Context = React.createContext({
|
||||
outlet: null,
|
||||
append: function () { },
|
||||
remove: function () { },
|
||||
});
|
||||
Context.displayName = 'BottomSheetPortalContext';
|
||||
function Provider(props) {
|
||||
var map = React.useRef({});
|
||||
var _a = React.useState(null), outlet = _a[0], setOutlet = _a[1];
|
||||
var append = React.useCallback(function (id, component) {
|
||||
if (map.current[id])
|
||||
return;
|
||||
map.current[id] = _jsx(React.Fragment, { children: component }, id);
|
||||
setOutlet(_jsx(_Fragment, { children: Object.values(map.current) }));
|
||||
}, []);
|
||||
var remove = React.useCallback(function (id) {
|
||||
delete map.current[id];
|
||||
setOutlet(_jsx(_Fragment, { children: Object.values(map.current) }));
|
||||
}, []);
|
||||
var contextValue = React.useMemo(function () { return ({
|
||||
outlet: outlet,
|
||||
append: append,
|
||||
remove: remove,
|
||||
}); }, [outlet, append, remove]);
|
||||
return (_jsx(Context.Provider, { value: contextValue, children: props.children }));
|
||||
}
|
||||
function Outlet() {
|
||||
var ctx = React.useContext(Context);
|
||||
return ctx.outlet;
|
||||
}
|
||||
function Portal(_a) {
|
||||
var children = _a.children;
|
||||
var _b = React.useContext(Context), append = _b.append, remove = _b.remove;
|
||||
var id = React.useId();
|
||||
React.useEffect(function () {
|
||||
append(id, children);
|
||||
return function () { return remove(id); };
|
||||
}, [id, children, append, remove]);
|
||||
return null;
|
||||
}
|
||||
return { Provider: Provider, Outlet: Outlet, Portal: Portal };
|
||||
}
|
||||
+113
@@ -0,0 +1,113 @@
|
||||
var __assign = (this && this.__assign) || function () {
|
||||
__assign = Object.assign || function(t) {
|
||||
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
||||
s = arguments[i];
|
||||
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
||||
t[p] = s[p];
|
||||
}
|
||||
return t;
|
||||
};
|
||||
return __assign.apply(this, arguments);
|
||||
};
|
||||
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
||||
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
||||
return new (P || (P = Promise))(function (resolve, reject) {
|
||||
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
||||
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
||||
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
||||
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
||||
});
|
||||
};
|
||||
var __generator = (this && this.__generator) || function (thisArg, body) {
|
||||
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
||||
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
||||
function verb(n) { return function (v) { return step([n, v]); }; }
|
||||
function step(op) {
|
||||
if (f) throw new TypeError("Generator is already executing.");
|
||||
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
||||
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
||||
if (y = 0, t) op = [op[0] & 2, t.value];
|
||||
switch (op[0]) {
|
||||
case 0: case 1: t = op; break;
|
||||
case 4: _.label++; return { value: op[1], done: false };
|
||||
case 5: _.label++; y = op[1]; op = [0]; continue;
|
||||
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
||||
default:
|
||||
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
||||
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
||||
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
||||
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
||||
if (t[2]) _.ops.pop();
|
||||
_.trys.pop(); continue;
|
||||
}
|
||||
op = body.call(thisArg, _);
|
||||
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
||||
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
||||
}
|
||||
};
|
||||
import { jsx as _jsx } from "react/jsx-runtime";
|
||||
import React from 'react';
|
||||
import { BackgroundNotificationHandler } from './ExpoBackgroundNotificationHandlerModule';
|
||||
var Context = React.createContext({});
|
||||
export var useBackgroundNotificationPreferences = function () {
|
||||
return React.useContext(Context);
|
||||
};
|
||||
export function BackgroundNotificationPreferencesProvider(_a) {
|
||||
var _this = this;
|
||||
var children = _a.children;
|
||||
var _b = React.useState({
|
||||
playSoundChat: true,
|
||||
}), preferences = _b[0], setPreferences = _b[1];
|
||||
React.useEffect(function () {
|
||||
;
|
||||
(function () { return __awaiter(_this, void 0, void 0, function () {
|
||||
var prefs;
|
||||
return __generator(this, function (_a) {
|
||||
switch (_a.label) {
|
||||
case 0: return [4 /*yield*/, BackgroundNotificationHandler.getAllPrefsAsync()];
|
||||
case 1:
|
||||
prefs = _a.sent();
|
||||
setPreferences(prefs);
|
||||
return [2 /*return*/];
|
||||
}
|
||||
});
|
||||
}); })();
|
||||
}, []);
|
||||
var value = React.useMemo(function () { return ({
|
||||
preferences: preferences,
|
||||
setPref: function (k, v) { return __awaiter(_this, void 0, void 0, function () {
|
||||
var _a;
|
||||
return __generator(this, function (_b) {
|
||||
switch (_b.label) {
|
||||
case 0:
|
||||
_a = typeof v;
|
||||
switch (_a) {
|
||||
case 'boolean': return [3 /*break*/, 1];
|
||||
case 'string': return [3 /*break*/, 3];
|
||||
}
|
||||
return [3 /*break*/, 5];
|
||||
case 1: return [4 /*yield*/, BackgroundNotificationHandler.setBoolAsync(k, v)];
|
||||
case 2:
|
||||
_b.sent();
|
||||
return [3 /*break*/, 6];
|
||||
case 3: return [4 /*yield*/, BackgroundNotificationHandler.setStringAsync(k, v)];
|
||||
case 4:
|
||||
_b.sent();
|
||||
return [3 /*break*/, 6];
|
||||
case 5:
|
||||
{
|
||||
throw new Error("Invalid type for value: ".concat(typeof v));
|
||||
}
|
||||
_b.label = 6;
|
||||
case 6:
|
||||
setPreferences(function (prev) {
|
||||
var _a;
|
||||
return (__assign(__assign({}, prev), (_a = {}, _a[k] = v, _a)));
|
||||
});
|
||||
return [2 /*return*/];
|
||||
}
|
||||
});
|
||||
}); },
|
||||
}); }, [preferences]);
|
||||
return _jsx(Context.Provider, { value: value, children: children });
|
||||
}
|
||||
+1
@@ -0,0 +1 @@
|
||||
export {};
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
import { requireNativeModule } from 'expo-modules-core';
|
||||
export var BackgroundNotificationHandler = requireNativeModule('ExpoBackgroundNotificationHandler');
|
||||
@@ -0,0 +1 @@
|
||||
export {};
|
||||
Reference in New Issue
Block a user